@tldraw/editor 3.13.0-canary.63efd1b35848 → 3.13.0-canary.66687519f459

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 (131) hide show
  1. package/dist-cjs/index.d.ts +99 -99
  2. package/dist-cjs/index.js +7 -22
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/components/Shape.js +2 -1
  5. package/dist-cjs/lib/components/Shape.js.map +2 -2
  6. package/dist-cjs/lib/components/default-components/DefaultCanvas.js +9 -5
  7. package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
  8. package/dist-cjs/lib/editor/Editor.js +84 -23
  9. package/dist-cjs/lib/editor/Editor.js.map +2 -2
  10. package/dist-cjs/lib/editor/managers/SnapManager/HandleSnaps.js.map +2 -2
  11. package/dist-cjs/lib/editor/managers/TextManager.js +10 -0
  12. package/dist-cjs/lib/editor/managers/TextManager.js.map +2 -2
  13. package/dist-cjs/lib/editor/shapes/ShapeUtil.js +1 -1
  14. package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
  15. package/dist-cjs/lib/editor/shapes/group/GroupShapeUtil.js +0 -3
  16. package/dist-cjs/lib/editor/shapes/group/GroupShapeUtil.js.map +2 -2
  17. package/dist-cjs/lib/editor/shapes/shared/getPerfectDashProps.js.map +2 -2
  18. package/dist-cjs/lib/hooks/useEditorComponents.js +1 -2
  19. package/dist-cjs/lib/hooks/useEditorComponents.js.map +2 -2
  20. package/dist-cjs/lib/primitives/Box.js +16 -0
  21. package/dist-cjs/lib/primitives/Box.js.map +2 -2
  22. package/dist-cjs/lib/primitives/Mat.js +1 -1
  23. package/dist-cjs/lib/primitives/Mat.js.map +2 -2
  24. package/dist-cjs/lib/primitives/Vec.js +20 -0
  25. package/dist-cjs/lib/primitives/Vec.js.map +2 -2
  26. package/dist-cjs/lib/primitives/geometry/Arc2d.js +2 -2
  27. package/dist-cjs/lib/primitives/geometry/Arc2d.js.map +2 -2
  28. package/dist-cjs/lib/primitives/geometry/Circle2d.js +1 -1
  29. package/dist-cjs/lib/primitives/geometry/Circle2d.js.map +2 -2
  30. package/dist-cjs/lib/primitives/geometry/CubicBezier2d.js +1 -1
  31. package/dist-cjs/lib/primitives/geometry/CubicBezier2d.js.map +2 -2
  32. package/dist-cjs/lib/primitives/geometry/CubicSpline2d.js.map +2 -2
  33. package/dist-cjs/lib/primitives/geometry/Edge2d.js +1 -1
  34. package/dist-cjs/lib/primitives/geometry/Edge2d.js.map +2 -2
  35. package/dist-cjs/lib/primitives/geometry/Ellipse2d.js.map +2 -2
  36. package/dist-cjs/lib/primitives/geometry/Geometry2d.js +91 -20
  37. package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
  38. package/dist-cjs/lib/primitives/geometry/Group2d.js +55 -2
  39. package/dist-cjs/lib/primitives/geometry/Group2d.js.map +2 -2
  40. package/dist-cjs/lib/primitives/geometry/Point2d.js.map +2 -2
  41. package/dist-cjs/lib/primitives/geometry/Polyline2d.js.map +2 -2
  42. package/dist-cjs/lib/primitives/geometry/Stadium2d.js.map +2 -2
  43. package/dist-cjs/lib/utils/areShapesContentEqual.js +25 -0
  44. package/dist-cjs/lib/utils/areShapesContentEqual.js.map +7 -0
  45. package/dist-cjs/lib/utils/debug-flags.js +5 -2
  46. package/dist-cjs/lib/utils/debug-flags.js.map +2 -2
  47. package/dist-cjs/version.js +3 -3
  48. package/dist-cjs/version.js.map +1 -1
  49. package/dist-esm/index.d.mts +99 -99
  50. package/dist-esm/index.mjs +9 -41
  51. package/dist-esm/index.mjs.map +2 -2
  52. package/dist-esm/lib/components/Shape.mjs +2 -1
  53. package/dist-esm/lib/components/Shape.mjs.map +2 -2
  54. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +9 -5
  55. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
  56. package/dist-esm/lib/editor/Editor.mjs +84 -23
  57. package/dist-esm/lib/editor/Editor.mjs.map +2 -2
  58. package/dist-esm/lib/editor/managers/SnapManager/HandleSnaps.mjs.map +2 -2
  59. package/dist-esm/lib/editor/managers/TextManager.mjs +10 -0
  60. package/dist-esm/lib/editor/managers/TextManager.mjs.map +2 -2
  61. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +1 -1
  62. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
  63. package/dist-esm/lib/editor/shapes/group/GroupShapeUtil.mjs +0 -3
  64. package/dist-esm/lib/editor/shapes/group/GroupShapeUtil.mjs.map +2 -2
  65. package/dist-esm/lib/editor/shapes/shared/getPerfectDashProps.mjs.map +2 -2
  66. package/dist-esm/lib/hooks/useEditorComponents.mjs +1 -4
  67. package/dist-esm/lib/hooks/useEditorComponents.mjs.map +2 -2
  68. package/dist-esm/lib/primitives/Box.mjs +16 -0
  69. package/dist-esm/lib/primitives/Box.mjs.map +2 -2
  70. package/dist-esm/lib/primitives/Mat.mjs +1 -1
  71. package/dist-esm/lib/primitives/Mat.mjs.map +2 -2
  72. package/dist-esm/lib/primitives/Vec.mjs +20 -0
  73. package/dist-esm/lib/primitives/Vec.mjs.map +2 -2
  74. package/dist-esm/lib/primitives/geometry/Arc2d.mjs +2 -2
  75. package/dist-esm/lib/primitives/geometry/Arc2d.mjs.map +2 -2
  76. package/dist-esm/lib/primitives/geometry/Circle2d.mjs +1 -1
  77. package/dist-esm/lib/primitives/geometry/Circle2d.mjs.map +2 -2
  78. package/dist-esm/lib/primitives/geometry/CubicBezier2d.mjs +1 -1
  79. package/dist-esm/lib/primitives/geometry/CubicBezier2d.mjs.map +2 -2
  80. package/dist-esm/lib/primitives/geometry/CubicSpline2d.mjs.map +2 -2
  81. package/dist-esm/lib/primitives/geometry/Edge2d.mjs +1 -1
  82. package/dist-esm/lib/primitives/geometry/Edge2d.mjs.map +2 -2
  83. package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs.map +2 -2
  84. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +92 -21
  85. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
  86. package/dist-esm/lib/primitives/geometry/Group2d.mjs +55 -2
  87. package/dist-esm/lib/primitives/geometry/Group2d.mjs.map +2 -2
  88. package/dist-esm/lib/primitives/geometry/Point2d.mjs.map +2 -2
  89. package/dist-esm/lib/primitives/geometry/Polyline2d.mjs.map +2 -2
  90. package/dist-esm/lib/primitives/geometry/Stadium2d.mjs.map +2 -2
  91. package/dist-esm/lib/utils/areShapesContentEqual.mjs +5 -0
  92. package/dist-esm/lib/utils/areShapesContentEqual.mjs.map +7 -0
  93. package/dist-esm/lib/utils/debug-flags.mjs +5 -2
  94. package/dist-esm/lib/utils/debug-flags.mjs.map +2 -2
  95. package/dist-esm/version.mjs +3 -3
  96. package/dist-esm/version.mjs.map +1 -1
  97. package/editor.css +36 -4
  98. package/package.json +7 -7
  99. package/src/index.ts +16 -31
  100. package/src/lib/components/Shape.tsx +2 -4
  101. package/src/lib/components/default-components/DefaultCanvas.tsx +9 -5
  102. package/src/lib/editor/Editor.test.ts +1 -1
  103. package/src/lib/editor/Editor.ts +95 -23
  104. package/src/lib/editor/managers/SnapManager/HandleSnaps.ts +0 -1
  105. package/src/lib/editor/managers/TextManager.ts +12 -0
  106. package/src/lib/editor/shapes/ShapeUtil.ts +10 -2
  107. package/src/lib/editor/shapes/group/GroupShapeUtil.tsx +0 -4
  108. package/src/lib/editor/shapes/shared/getPerfectDashProps.ts +9 -9
  109. package/src/lib/hooks/useEditorComponents.tsx +2 -5
  110. package/src/lib/primitives/Box.ts +20 -0
  111. package/src/lib/primitives/Mat.ts +5 -4
  112. package/src/lib/primitives/Vec.ts +23 -0
  113. package/src/lib/primitives/geometry/Arc2d.ts +5 -5
  114. package/src/lib/primitives/geometry/Circle2d.ts +4 -4
  115. package/src/lib/primitives/geometry/CubicBezier2d.ts +4 -4
  116. package/src/lib/primitives/geometry/CubicSpline2d.ts +3 -3
  117. package/src/lib/primitives/geometry/Edge2d.ts +3 -3
  118. package/src/lib/primitives/geometry/Ellipse2d.ts +3 -3
  119. package/src/lib/primitives/geometry/Geometry2d.test.ts +42 -0
  120. package/src/lib/primitives/geometry/Geometry2d.ts +123 -35
  121. package/src/lib/primitives/geometry/Group2d.ts +70 -7
  122. package/src/lib/primitives/geometry/Point2d.ts +2 -2
  123. package/src/lib/primitives/geometry/Polyline2d.ts +3 -3
  124. package/src/lib/primitives/geometry/Stadium2d.ts +3 -3
  125. package/src/lib/test/currentToolIdMask.test.ts +1 -1
  126. package/src/lib/test/user.test.ts +1 -1
  127. package/src/lib/utils/areShapesContentEqual.ts +4 -0
  128. package/src/lib/utils/debug-flags.ts +7 -2
  129. package/src/lib/utils/sync/LocalIndexedDb.test.ts +1 -1
  130. package/src/lib/utils/sync/TLLocalSyncClient.test.ts +1 -1
  131. package/src/version.ts +3 -3
@@ -1,8 +1,8 @@
1
- const version = "3.13.0-canary.63efd1b35848";
1
+ const version = "3.13.0-canary.66687519f459";
2
2
  const publishDates = {
3
3
  major: "2024-09-13T14:36:29.063Z",
4
- minor: "2025-05-02T10:53:59.889Z",
5
- patch: "2025-05-02T10:53:59.889Z"
4
+ minor: "2025-05-12T13:38:04.436Z",
5
+ patch: "2025-05-12T13:38:04.436Z"
6
6
  };
7
7
  export {
8
8
  publishDates,
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/version.ts"],
4
- "sourcesContent": ["// This file is automatically generated by internal/scripts/refresh-assets.ts.\n// Do not edit manually. Or do, I'm a comment, not a cop.\n\nexport const version = '3.13.0-canary.63efd1b35848'\nexport const publishDates = {\n\tmajor: '2024-09-13T14:36:29.063Z',\n\tminor: '2025-05-02T10:53:59.889Z',\n\tpatch: '2025-05-02T10:53:59.889Z',\n}\n"],
4
+ "sourcesContent": ["// This file is automatically generated by internal/scripts/refresh-assets.ts.\n// Do not edit manually. Or do, I'm a comment, not a cop.\n\nexport const version = '3.13.0-canary.66687519f459'\nexport const publishDates = {\n\tmajor: '2024-09-13T14:36:29.063Z',\n\tminor: '2025-05-12T13:38:04.436Z',\n\tpatch: '2025-05-12T13:38:04.436Z',\n}\n"],
5
5
  "mappings": "AAGO,MAAM,UAAU;AAChB,MAAM,eAAe;AAAA,EAC3B,OAAO;AAAA,EACP,OAAO;AAAA,EACP,OAAO;AACR;",
6
6
  "names": []
7
7
  }
package/editor.css CHANGED
@@ -157,6 +157,7 @@
157
157
  --color-panel-contrast: hsl(0, 0%, 100%);
158
158
  --color-panel-overlay: hsl(0, 0%, 100%, 82%);
159
159
  --color-panel: hsl(0, 0%, 99%);
160
+ --color-panel-transparent: hsla(0, 0%, 99%, 0%);
160
161
  --color-focus: hsl(219, 65%, 50%);
161
162
  --color-selected: hsl(214, 84%, 56%);
162
163
  --color-selected-contrast: hsl(0, 0%, 100%);
@@ -208,6 +209,7 @@
208
209
  --color-panel-contrast: hsl(245, 12%, 23%);
209
210
  --color-panel: hsl(235, 6.8%, 13.5%);
210
211
  --color-panel-overlay: hsl(210, 10%, 24%, 82%);
212
+ --color-panel-transparent: hsla(235, 6.8%, 13.5%, 0%);
211
213
  --color-focus: hsl(217, 76%, 80%);
212
214
  --color-selected: hsl(217, 89%, 61%);
213
215
  --color-selected-contrast: hsl(0, 0%, 100%);
@@ -600,6 +602,36 @@ input,
600
602
  }
601
603
  }
602
604
 
605
+ .tl-rotate-corner:not(:hover),
606
+ .tl-resize-handle:not(:hover) {
607
+ cursor: none;
608
+ }
609
+
610
+ /* --------------------- Arrow Hints -------------------- */
611
+
612
+ .tl-arrow-hint-handle {
613
+ fill: var(--color-selected-contrast);
614
+ stroke: var(--color-selection-stroke);
615
+ stroke-width: calc(1.5px * var(--tl-scale));
616
+ r: calc(4px * var(--tl-scale));
617
+ }
618
+
619
+ .tl-arrow-hint-snap {
620
+ stroke: transparent;
621
+ fill: var(--color-selection-fill);
622
+ r: calc(12px * var(--tl-scale));
623
+ }
624
+
625
+ .tl-arrow-hint-snap__none,
626
+ .tl-arrow-hint-snap__center,
627
+ .tl-arrow-hint-snap__axis {
628
+ display: none;
629
+ }
630
+
631
+ .tl-arrow-hint-snap__edge {
632
+ r: calc(8px * var(--tl-scale));
633
+ }
634
+
603
635
  /* ------------------ Bounds Detail ----------------- */
604
636
 
605
637
  .tl-image,
@@ -969,6 +1001,8 @@ input,
969
1001
 
970
1002
  .tl-rich-text p {
971
1003
  margin: 0;
1004
+ /* Depending on the extensions, <p> tags can be empty, without a <br />. */
1005
+ min-height: 1lh;
972
1006
  }
973
1007
 
974
1008
  .tl-rich-text ul,
@@ -976,6 +1010,8 @@ input,
976
1010
  text-align: left;
977
1011
  margin: 0;
978
1012
  padding-left: 3.25ch;
1013
+ /* Some resets, like Tailwind, nix the list styling. */
1014
+ list-style: revert;
979
1015
  }
980
1016
 
981
1017
  .tl-rich-text ol:has(> li:nth-child(10)) {
@@ -1353,10 +1389,6 @@ input,
1353
1389
  opacity: 0;
1354
1390
  }
1355
1391
 
1356
- .tl-arrow-label[data-isediting='true'] > .tl-arrow-label__inner {
1357
- background-color: var(--color-background);
1358
- }
1359
-
1360
1392
  .tl-arrow-label__inner {
1361
1393
  border-radius: var(--radius-1);
1362
1394
  box-sizing: content-box;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@tldraw/editor",
3
3
  "description": "A tiny little drawing app (editor).",
4
- "version": "3.13.0-canary.63efd1b35848",
4
+ "version": "3.13.0-canary.66687519f459",
5
5
  "author": {
6
6
  "name": "tldraw Inc.",
7
7
  "email": "hello@tldraw.com"
@@ -48,12 +48,12 @@
48
48
  "@tiptap/core": "^2.9.1",
49
49
  "@tiptap/pm": "^2.9.1",
50
50
  "@tiptap/react": "^2.9.1",
51
- "@tldraw/state": "3.13.0-canary.63efd1b35848",
52
- "@tldraw/state-react": "3.13.0-canary.63efd1b35848",
53
- "@tldraw/store": "3.13.0-canary.63efd1b35848",
54
- "@tldraw/tlschema": "3.13.0-canary.63efd1b35848",
55
- "@tldraw/utils": "3.13.0-canary.63efd1b35848",
56
- "@tldraw/validate": "3.13.0-canary.63efd1b35848",
51
+ "@tldraw/state": "3.13.0-canary.66687519f459",
52
+ "@tldraw/state-react": "3.13.0-canary.66687519f459",
53
+ "@tldraw/store": "3.13.0-canary.66687519f459",
54
+ "@tldraw/tlschema": "3.13.0-canary.66687519f459",
55
+ "@tldraw/utils": "3.13.0-canary.66687519f459",
56
+ "@tldraw/validate": "3.13.0-canary.66687519f459",
57
57
  "@types/core-js": "^2.5.8",
58
58
  "@use-gesture/react": "^10.3.1",
59
59
  "classnames": "^2.5.1",
package/src/index.ts CHANGED
@@ -4,37 +4,11 @@ import 'core-js/stable/array/flat-map.js'
4
4
  import 'core-js/stable/array/flat.js'
5
5
  import 'core-js/stable/string/at.js'
6
6
  import 'core-js/stable/string/replace-all.js'
7
- export {
8
- EMPTY_ARRAY,
9
- EffectScheduler,
10
- atom,
11
- computed,
12
- react,
13
- transact,
14
- transaction,
15
- whyAmIRunning,
16
- type Atom,
17
- type Signal,
18
- } from '@tldraw/state'
19
- export {
20
- track,
21
- useAtom,
22
- useComputed,
23
- useQuickReactor,
24
- useReactor,
25
- useStateTracking,
26
- useValue,
27
- } from '@tldraw/state-react'
28
- export { resizeScaled } from './lib/editor/shapes/shared/resizeScaled'
29
- export {
30
- getFontsFromRichText,
31
- type RichTextFontVisitor,
32
- type RichTextFontVisitorState,
33
- type TLTextOptions,
34
- type TiptapEditor,
35
- type TiptapNode,
36
- } from './lib/utils/richText'
37
- export { LocalIndexedDb, Table, type StoreName } from './lib/utils/sync/LocalIndexedDb'
7
+
8
+ // eslint-disable-next-line local/no-export-star
9
+ export * from '@tldraw/state'
10
+ // eslint-disable-next-line local/no-export-star
11
+ export * from '@tldraw/state-react'
38
12
  // eslint-disable-next-line local/no-export-star
39
13
  export * from '@tldraw/store'
40
14
  // eslint-disable-next-line local/no-export-star
@@ -43,6 +17,7 @@ export * from '@tldraw/tlschema'
43
17
  export * from '@tldraw/utils'
44
18
  // eslint-disable-next-line local/no-export-star
45
19
  export * from '@tldraw/validate'
20
+
46
21
  export {
47
22
  ErrorScreen,
48
23
  LoadingScreen,
@@ -212,6 +187,7 @@ export {
212
187
  export { GroupShapeUtil } from './lib/editor/shapes/group/GroupShapeUtil'
213
188
  export { getPerfectDashProps } from './lib/editor/shapes/shared/getPerfectDashProps'
214
189
  export { resizeBox, type ResizeBoxOptions } from './lib/editor/shapes/shared/resizeBox'
190
+ export { resizeScaled } from './lib/editor/shapes/shared/resizeScaled'
215
191
  export { BaseBoxShapeTool } from './lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool'
216
192
  export { maybeSnapToGrid } from './lib/editor/tools/BaseBoxShapeTool/children/Pointing'
217
193
  export { StateNode, type TLStateNodeConstructor } from './lib/editor/tools/StateNode'
@@ -459,12 +435,21 @@ export { hardResetEditor } from './lib/utils/hardResetEditor'
459
435
  export { isAccelKey } from './lib/utils/keyboard'
460
436
  export { normalizeWheel } from './lib/utils/normalizeWheel'
461
437
  export { refreshPage } from './lib/utils/refreshPage'
438
+ export {
439
+ getFontsFromRichText,
440
+ type RichTextFontVisitor,
441
+ type RichTextFontVisitorState,
442
+ type TLTextOptions,
443
+ type TiptapEditor,
444
+ type TiptapNode,
445
+ } from './lib/utils/richText'
462
446
  export {
463
447
  applyRotationToSnapshotShapes,
464
448
  getRotationSnapshot,
465
449
  type TLRotationSnapshot,
466
450
  } from './lib/utils/rotation'
467
451
  export { runtime, setRuntimeOverrides } from './lib/utils/runtime'
452
+ export { LocalIndexedDb, Table, type StoreName } from './lib/utils/sync/LocalIndexedDb'
468
453
  export { type TLStoreWithStatus } from './lib/utils/sync/StoreWithStatus'
469
454
  export { hardReset } from './lib/utils/sync/hardReset'
470
455
  export { uniq } from './lib/utils/uniq'
@@ -6,6 +6,7 @@ import { ShapeUtil } from '../editor/shapes/ShapeUtil'
6
6
  import { useEditor } from '../hooks/useEditor'
7
7
  import { useEditorComponents } from '../hooks/useEditorComponents'
8
8
  import { Mat } from '../primitives/Mat'
9
+ import { areShapesContentEqual } from '../utils/areShapesContentEqual'
9
10
  import { setStyleProperty } from '../utils/dom'
10
11
  import { OptionalErrorBoundary } from './ErrorBoundary'
11
12
 
@@ -190,10 +191,7 @@ export const InnerShape = memo(
190
191
  [util, shape.id]
191
192
  )
192
193
  },
193
- (prev, next) =>
194
- prev.shape.props === next.shape.props &&
195
- prev.shape.meta === next.shape.meta &&
196
- prev.util === next.util
194
+ (prev, next) => areShapesContentEqual(prev.shape, next.shape) && prev.util === next.util
197
195
  )
198
196
 
199
197
  export const InnerShapeBackground = memo(
@@ -37,7 +37,7 @@ export interface TLCanvasComponentProps {
37
37
  export function DefaultCanvas({ className }: TLCanvasComponentProps) {
38
38
  const editor = useEditor()
39
39
 
40
- const { Background, SvgDefs, ShapeIndicators } = useEditorComponents()
40
+ const { SelectionBackground, Background, SvgDefs, ShapeIndicators } = useEditorComponents()
41
41
 
42
42
  const rCanvas = useRef<HTMLDivElement>(null)
43
43
  const rHtmlLayer = useRef<HTMLDivElement>(null)
@@ -155,7 +155,7 @@ export function DefaultCanvas({ className }: TLCanvasComponentProps) {
155
155
  <GridWrapper />
156
156
  <div ref={rHtmlLayer} className="tl-html-layer tl-shapes" draggable={false}>
157
157
  <OnTheCanvasWrapper />
158
- <SelectionBackgroundWrapper />
158
+ {SelectionBackground && <SelectionBackgroundWrapper />}
159
159
  {hideShapes ? null : debugSvg ? <ShapesWithSVGs /> : <ShapesToDisplay />}
160
160
  </div>
161
161
  <div className="tl-overlays">
@@ -575,9 +575,13 @@ function DebugSvgCopy({ id, mode }: { id: TLShapeId; mode: 'img' | 'iframe' }) {
575
575
 
576
576
  function SelectionForegroundWrapper() {
577
577
  const editor = useEditor()
578
- const selectionRotation = useValue('selection rotation', () => editor.getSelectionRotation(), [
579
- editor,
580
- ])
578
+ const selectionRotation = useValue(
579
+ 'selection rotation',
580
+ function getSelectionRotation() {
581
+ return editor.getSelectionRotation()
582
+ },
583
+ [editor]
584
+ )
581
585
  const selectionBounds = useValue(
582
586
  'selection bounds',
583
587
  () => editor.getSelectionRotatedPageBounds(),
@@ -52,7 +52,7 @@ beforeEach(() => {
52
52
  shapeUtils: [CustomShape],
53
53
  bindingUtils: [],
54
54
  tools: [],
55
- store: createTLStore({ shapeUtils: [CustomShape] }),
55
+ store: createTLStore({ shapeUtils: [CustomShape], bindingUtils: [] }),
56
56
  getContainer: () => document.body,
57
57
  })
58
58
  editor.setCameraOptions({ isLocked: true })
@@ -129,6 +129,7 @@ import { Group2d } from '../primitives/geometry/Group2d'
129
129
  import { intersectPolygonPolygon } from '../primitives/intersect'
130
130
  import { PI, approximately, areAnglesCompatible, clamp, pointInPolygon } from '../primitives/utils'
131
131
  import { ReadonlySharedStyleMap, SharedStyle, SharedStyleMap } from '../utils/SharedStylesMap'
132
+ import { areShapesContentEqual } from '../utils/areShapesContentEqual'
132
133
  import { dataUrlToFile } from '../utils/assets'
133
134
  import { debugFlags } from '../utils/debug-flags'
134
135
  import {
@@ -325,7 +326,6 @@ export class Editor extends EventEmitter<TLEventMap> {
325
326
  this.options = { ...defaultTldrawOptions, ...options }
326
327
 
327
328
  this.store = store
328
- this.disposables.add(this.store.dispose.bind(this.store))
329
329
  this.history = new HistoryManager<TLRecord>({
330
330
  store,
331
331
  annotateError: (error) => {
@@ -955,6 +955,7 @@ export class Editor extends EventEmitter<TLEventMap> {
955
955
  dispose() {
956
956
  this.disposables.forEach((dispose) => dispose())
957
957
  this.disposables.clear()
958
+ this.store.dispose()
958
959
  this.isDisposed = true
959
960
  }
960
961
 
@@ -1814,9 +1815,28 @@ export class Editor extends EventEmitter<TLEventMap> {
1814
1815
  return this
1815
1816
  }
1816
1817
 
1818
+ /**
1819
+ * Select the next shape in the reading order or in cardinal order.
1820
+ *
1821
+ * @example
1822
+ * ```ts
1823
+ * editor.selectAdjacentShape('next')
1824
+ * ```
1825
+ *
1826
+ * @public
1827
+ */
1817
1828
  selectAdjacentShape(direction: TLAdjacentDirection) {
1818
- const readingOrderShapes = this.getCurrentPageShapesInReadingOrder()
1819
1829
  const selectedShapeIds = this.getSelectedShapeIds()
1830
+ const firstParentId = selectedShapeIds[0] ? this.getShape(selectedShapeIds[0])?.parentId : null
1831
+ const isSelectedWithinContainer =
1832
+ firstParentId &&
1833
+ selectedShapeIds.every((shapeId) => this.getShape(shapeId)?.parentId === firstParentId) &&
1834
+ !isPageId(firstParentId)
1835
+ const readingOrderShapes = isSelectedWithinContainer
1836
+ ? this._getShapesInReadingOrder(
1837
+ this.getCurrentPageShapes().filter((shape) => shape.parentId === firstParentId)
1838
+ )
1839
+ : this.getCurrentPageShapesInReadingOrder()
1820
1840
  const currentShapeId: TLShapeId | undefined =
1821
1841
  selectedShapeIds.length === 1
1822
1842
  ? selectedShapeIds[0]
@@ -1838,13 +1858,7 @@ export class Editor extends EventEmitter<TLEventMap> {
1838
1858
  const shape = this.getShape(adjacentShapeId)
1839
1859
  if (!shape) return
1840
1860
 
1841
- this.setSelectedShapes([shape.id])
1842
- this.zoomToSelectionIfOffscreen(256, {
1843
- animation: {
1844
- duration: this.options.animationMediumMs,
1845
- },
1846
- inset: 0,
1847
- })
1861
+ this._selectShapesAndZoom([shape.id])
1848
1862
  }
1849
1863
 
1850
1864
  /**
@@ -1854,10 +1868,14 @@ export class Editor extends EventEmitter<TLEventMap> {
1854
1868
  * @public
1855
1869
  */
1856
1870
  @computed getCurrentPageShapesInReadingOrder(): TLShape[] {
1871
+ const shapes = this.getCurrentPageShapes().filter((shape) => isPageId(shape.parentId))
1872
+ return this._getShapesInReadingOrder(shapes)
1873
+ }
1874
+
1875
+ private _getShapesInReadingOrder(shapes: TLShape[]): TLShape[] {
1857
1876
  const SHALLOW_ANGLE = 20
1858
1877
  const ROW_THRESHOLD = 100
1859
1878
 
1860
- const shapes = this.getCurrentPageShapes()
1861
1879
  const tabbableShapes = shapes.filter((shape) => this.getShapeUtil(shape).canTabTo(shape))
1862
1880
 
1863
1881
  if (tabbableShapes.length <= 1) return tabbableShapes
@@ -2003,6 +2021,36 @@ export class Editor extends EventEmitter<TLEventMap> {
2003
2021
  return lowestScoringShape!.shape.id
2004
2022
  }
2005
2023
 
2024
+ selectParentShape() {
2025
+ const selectedShape = this.getOnlySelectedShape()
2026
+ if (!selectedShape) return
2027
+ const parentShape = this.getShape(selectedShape.parentId)
2028
+ if (!parentShape) return
2029
+ this._selectShapesAndZoom([parentShape.id])
2030
+ }
2031
+
2032
+ selectFirstChildShape() {
2033
+ const selectedShapes = this.getSelectedShapes()
2034
+ if (!selectedShapes.length) return
2035
+ const selectedShape = selectedShapes[0]
2036
+ const children = this.getSortedChildIdsForParent(selectedShape.id)
2037
+ .map((id) => this.getShape(id))
2038
+ .filter((i) => i) as TLShape[]
2039
+ const sortedChildren = this._getShapesInReadingOrder(children)
2040
+ if (sortedChildren.length === 0) return
2041
+ this._selectShapesAndZoom([sortedChildren[0].id])
2042
+ }
2043
+
2044
+ private _selectShapesAndZoom(ids: TLShapeId[]) {
2045
+ this.setSelectedShapes(ids)
2046
+ this.zoomToSelectionIfOffscreen(256, {
2047
+ animation: {
2048
+ duration: this.options.animationMediumMs,
2049
+ },
2050
+ inset: 0,
2051
+ })
2052
+ }
2053
+
2006
2054
  /**
2007
2055
  * Clear the selection.
2008
2056
  *
@@ -2275,13 +2323,21 @@ export class Editor extends EventEmitter<TLEventMap> {
2275
2323
  setEditingShape(shape: TLShapeId | TLShape | null): this {
2276
2324
  const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
2277
2325
  this.setRichTextEditor(null)
2278
- if (id !== this.getEditingShapeId()) {
2326
+ const prevEditingShapeId = this.getEditingShapeId()
2327
+ if (id !== prevEditingShapeId) {
2279
2328
  if (id) {
2280
2329
  const shape = this.getShape(id)
2281
2330
  if (shape && this.getShapeUtil(shape).canEdit(shape)) {
2282
2331
  this.run(
2283
2332
  () => {
2284
2333
  this._updateCurrentPageState({ editingShapeId: id })
2334
+ if (prevEditingShapeId) {
2335
+ const prevEditingShape = this.getShape(prevEditingShapeId)
2336
+ if (prevEditingShape) {
2337
+ this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape)
2338
+ }
2339
+ }
2340
+ this.getShapeUtil(shape).onEditStart?.(shape)
2285
2341
  },
2286
2342
  { history: 'ignore' }
2287
2343
  )
@@ -2294,6 +2350,12 @@ export class Editor extends EventEmitter<TLEventMap> {
2294
2350
  () => {
2295
2351
  this._updateCurrentPageState({ editingShapeId: null })
2296
2352
  this._currentRichTextEditor.set(null)
2353
+ if (prevEditingShapeId) {
2354
+ const prevEditingShape = this.getShape(prevEditingShapeId)
2355
+ if (prevEditingShape) {
2356
+ this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape)
2357
+ }
2358
+ }
2297
2359
  },
2298
2360
  { history: 'ignore' }
2299
2361
  )
@@ -4574,7 +4636,7 @@ export class Editor extends EventEmitter<TLEventMap> {
4574
4636
  this.fonts.trackFontsForShape(shape)
4575
4637
  return this.getShapeUtil(shape).getGeometry(shape, opts)
4576
4638
  },
4577
- { areRecordsEqual: (a, b) => a.props === b.props }
4639
+ { areRecordsEqual: areShapesContentEqual }
4578
4640
  )
4579
4641
  }
4580
4642
  return this._shapeGeometryCaches[context].get(
@@ -4622,9 +4684,15 @@ export class Editor extends EventEmitter<TLEventMap> {
4622
4684
 
4623
4685
  /** @internal */
4624
4686
  @computed private _getShapeHandlesCache(): ComputedCache<TLHandle[] | undefined, TLShape> {
4625
- return this.store.createComputedCache('handles', (shape) => {
4626
- return this.getShapeUtil(shape).getHandles?.(shape)
4627
- })
4687
+ return this.store.createComputedCache(
4688
+ 'handles',
4689
+ (shape) => {
4690
+ return this.getShapeUtil(shape).getHandles?.(shape)
4691
+ },
4692
+ {
4693
+ areRecordsEqual: areShapesContentEqual,
4694
+ }
4695
+ )
4628
4696
  }
4629
4697
 
4630
4698
  /**
@@ -5845,9 +5913,15 @@ export class Editor extends EventEmitter<TLEventMap> {
5845
5913
  @computed
5846
5914
  private _getBindingsIndexCache() {
5847
5915
  const index = bindingsIndex(this)
5848
- return this.store.createComputedCache<TLBinding[], TLShape>('bindingsIndex', (shape) => {
5849
- return index.get().get(shape.id)
5850
- })
5916
+ return this.store.createComputedCache<TLBinding[], TLShape>(
5917
+ 'bindingsIndex',
5918
+ (shape) => {
5919
+ return index.get().get(shape.id)
5920
+ },
5921
+ // we can ignore the shape equality check here because the index is
5922
+ // computed incrementally based on what bindings are in the store
5923
+ { areRecordsEqual: () => true }
5924
+ )
5851
5925
  }
5852
5926
 
5853
5927
  /**
@@ -10330,12 +10404,10 @@ export class Editor extends EventEmitter<TLEventMap> {
10330
10404
  if (this.inputs.isPanning && this.inputs.isPointing) {
10331
10405
  // Handle spacebar / middle mouse button panning
10332
10406
  const { currentScreenPoint, previousScreenPoint } = this.inputs
10333
- const { panSpeed } = cameraOptions
10334
10407
  const offset = Vec.Sub(currentScreenPoint, previousScreenPoint)
10335
- this.setCamera(
10336
- new Vec(cx + (offset.x * panSpeed) / cz, cy + (offset.y * panSpeed) / cz, cz),
10337
- { immediate: true }
10338
- )
10408
+ this.setCamera(new Vec(cx + offset.x / cz, cy + offset.y / cz, cz), {
10409
+ immediate: true,
10410
+ })
10339
10411
  this.maybeTrackPerformance('Panning')
10340
10412
  return
10341
10413
  }
@@ -45,7 +45,6 @@ export interface HandleSnapGeometry {
45
45
 
46
46
  const defaultGetSelfSnapOutline = () => null
47
47
  const defaultGetSelfSnapPoints = () => []
48
-
49
48
  /** @public */
50
49
  export class HandleSnaps {
51
50
  readonly editor: Editor
@@ -32,6 +32,7 @@ export interface TLMeasureTextSpanOpts {
32
32
  fontStyle: string
33
33
  lineHeight: number
34
34
  textAlign: TLDefaultHorizontalAlignStyle
35
+ otherStyles?: Record<string, string>
35
36
  }
36
37
 
37
38
  const spaceCharacterRegex = /\s/
@@ -86,6 +87,7 @@ export class TextManager {
86
87
  */
87
88
  maxWidth: null | number
88
89
  minWidth?: null | number
90
+ otherStyles?: Record<string, string>
89
91
  padding: string
90
92
  disableOverflowWrapBreaking?: boolean
91
93
  }
@@ -112,6 +114,11 @@ export class TextManager {
112
114
  'overflow-wrap',
113
115
  opts.disableOverflowWrapBreaking ? 'normal' : 'break-word'
114
116
  )
117
+ if (opts.otherStyles) {
118
+ for (const [key, value] of Object.entries(opts.otherStyles)) {
119
+ wrapperElm.style.setProperty(key, value)
120
+ }
121
+ }
115
122
 
116
123
  const scrollWidth = wrapperElm.scrollWidth
117
124
  const rect = wrapperElm.getBoundingClientRect()
@@ -256,6 +263,11 @@ export class TextManager {
256
263
  elm.style.setProperty('line-height', `${opts.lineHeight * opts.fontSize}px`)
257
264
  elm.style.setProperty('text-align', textAlignmentsForLtr[opts.textAlign])
258
265
  elm.style.setProperty('font-style', opts.fontStyle)
266
+ if (opts.otherStyles) {
267
+ for (const [key, value] of Object.entries(opts.otherStyles)) {
268
+ elm.style.setProperty(key, value)
269
+ }
270
+ }
259
271
 
260
272
  const shouldTruncateToFirstLine =
261
273
  opts.overflow === 'truncate-ellipsis' || opts.overflow === 'truncate-clip'
@@ -245,7 +245,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
245
245
  *
246
246
  * @public
247
247
  */
248
- canEditInReadOnly(_shape: Shape): boolean {
248
+ canEditInReadonly(_shape: Shape): boolean {
249
249
  return false
250
250
  }
251
251
 
@@ -707,7 +707,15 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
707
707
  onClick?(shape: Shape): TLShapePartial<Shape> | void
708
708
 
709
709
  /**
710
- * A callback called when a shape finishes being editing.
710
+ * A callback called when a shape starts being edited.
711
+ *
712
+ * @param shape - The shape.
713
+ * @public
714
+ */
715
+ onEditStart?(shape: Shape): void
716
+
717
+ /**
718
+ * A callback called when a shape finishes being edited.
711
719
  *
712
720
  * @param shape - The shape.
713
721
  * @public
@@ -12,10 +12,6 @@ export class GroupShapeUtil extends ShapeUtil<TLGroupShape> {
12
12
  static override props = groupShapeProps
13
13
  static override migrations = groupShapeMigrations
14
14
 
15
- override canTabTo() {
16
- return false
17
- }
18
-
19
15
  override hideSelectionBoundsFg() {
20
16
  return true
21
17
  }
@@ -4,15 +4,15 @@ import { TLDefaultDashStyle } from '@tldraw/tlschema'
4
4
  export function getPerfectDashProps(
5
5
  totalLength: number,
6
6
  strokeWidth: number,
7
- opts = {} as Partial<{
8
- style: TLDefaultDashStyle
9
- snap: number
10
- end: 'skip' | 'outset' | 'none'
11
- start: 'skip' | 'outset' | 'none'
12
- lengthRatio: number
13
- closed: boolean
14
- forceSolid: boolean
15
- }>
7
+ opts: {
8
+ style?: TLDefaultDashStyle
9
+ snap?: number
10
+ end?: 'skip' | 'outset' | 'none'
11
+ start?: 'skip' | 'outset' | 'none'
12
+ lengthRatio?: number
13
+ closed?: boolean
14
+ forceSolid?: boolean
15
+ } = {}
16
16
  ): {
17
17
  strokeDasharray: string
18
18
  strokeDashoffset: string
@@ -19,10 +19,7 @@ import { DefaultHandle, TLHandleProps } from '../components/default-components/D
19
19
  import { DefaultHandles, TLHandlesProps } from '../components/default-components/DefaultHandles'
20
20
  import { DefaultLoadingScreen } from '../components/default-components/DefaultLoadingScreen'
21
21
  import { DefaultScribble, TLScribbleProps } from '../components/default-components/DefaultScribble'
22
- import {
23
- DefaultSelectionBackground,
24
- TLSelectionBackgroundProps,
25
- } from '../components/default-components/DefaultSelectionBackground'
22
+ import { TLSelectionBackgroundProps } from '../components/default-components/DefaultSelectionBackground'
26
23
  import {
27
24
  DefaultSelectionForeground,
28
25
  TLSelectionForegroundProps,
@@ -113,7 +110,7 @@ export function EditorComponentsProvider({
113
110
  OnTheCanvas: null,
114
111
  Overlays: null,
115
112
  Scribble: DefaultScribble,
116
- SelectionBackground: DefaultSelectionBackground,
113
+ SelectionBackground: null,
117
114
  SelectionForeground: DefaultSelectionForeground,
118
115
  ShapeIndicator: DefaultShapeIndicator,
119
116
  ShapeIndicators: DefaultShapeIndicators,
@@ -57,6 +57,11 @@ export class Box {
57
57
  this.x = n
58
58
  }
59
59
 
60
+ // eslint-disable-next-line no-restricted-syntax
61
+ get left() {
62
+ return this.x
63
+ }
64
+
60
65
  // eslint-disable-next-line no-restricted-syntax
61
66
  get midX() {
62
67
  return this.x + this.w / 2
@@ -67,6 +72,11 @@ export class Box {
67
72
  return this.x + this.w
68
73
  }
69
74
 
75
+ // eslint-disable-next-line no-restricted-syntax
76
+ get right() {
77
+ return this.x + this.w
78
+ }
79
+
70
80
  // eslint-disable-next-line no-restricted-syntax
71
81
  get minY() {
72
82
  return this.y
@@ -77,6 +87,11 @@ export class Box {
77
87
  this.y = n
78
88
  }
79
89
 
90
+ // eslint-disable-next-line no-restricted-syntax
91
+ get top() {
92
+ return this.y
93
+ }
94
+
80
95
  // eslint-disable-next-line no-restricted-syntax
81
96
  get midY() {
82
97
  return this.y + this.h / 2
@@ -87,6 +102,11 @@ export class Box {
87
102
  return this.y + this.h
88
103
  }
89
104
 
105
+ // eslint-disable-next-line no-restricted-syntax
106
+ get bottom() {
107
+ return this.y + this.h
108
+ }
109
+
90
110
  // eslint-disable-next-line no-restricted-syntax
91
111
  get width() {
92
112
  return this.w