@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.
Files changed (155) hide show
  1. package/dist-cjs/index.d.ts +184 -24
  2. package/dist-cjs/index.js +5 -4
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/TldrawEditor.js +4 -2
  5. package/dist-cjs/lib/TldrawEditor.js.map +2 -2
  6. package/dist-cjs/lib/components/default-components/DefaultCanvas.js +1 -1
  7. package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
  8. package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js +1 -1
  9. package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js.map +2 -2
  10. package/dist-cjs/lib/config/{createTLUser.js → createTLCurrentUser.js} +9 -9
  11. package/dist-cjs/lib/config/createTLCurrentUser.js.map +7 -0
  12. package/dist-cjs/lib/config/createTLStore.js +24 -1
  13. package/dist-cjs/lib/config/createTLStore.js.map +2 -2
  14. package/dist-cjs/lib/config/defaultShapes.js.map +2 -2
  15. package/dist-cjs/lib/editor/Editor.js +115 -8
  16. package/dist-cjs/lib/editor/Editor.js.map +3 -3
  17. package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js +1 -1
  18. package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js.map +2 -2
  19. package/dist-cjs/lib/editor/managers/SnapManager/BoundsSnaps.js +1 -1
  20. package/dist-cjs/lib/editor/managers/SnapManager/BoundsSnaps.js.map +2 -2
  21. package/dist-cjs/lib/editor/managers/SnapManager/HandleSnaps.js.map +2 -2
  22. package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js +4 -4
  23. package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js.map +2 -2
  24. package/dist-cjs/lib/editor/managers/TextManager/TextManager.js +102 -30
  25. package/dist-cjs/lib/editor/managers/TextManager/TextManager.js.map +2 -2
  26. package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js.map +2 -2
  27. package/dist-cjs/lib/editor/shapes/ShapeUtil.js +10 -0
  28. package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
  29. package/dist-cjs/lib/editor/types/clipboard-types.js.map +1 -1
  30. package/dist-cjs/lib/exports/StyleEmbedder.js +1 -1
  31. package/dist-cjs/lib/exports/StyleEmbedder.js.map +2 -2
  32. package/dist-cjs/lib/exports/getSvgJsx.js.map +2 -2
  33. package/dist-cjs/lib/hooks/useEditorComponents.js.map +2 -2
  34. package/dist-cjs/lib/hooks/useGestureEvents.js +171 -127
  35. package/dist-cjs/lib/hooks/useGestureEvents.js.map +3 -3
  36. package/dist-cjs/lib/hooks/useLocalStore.js.map +2 -2
  37. package/dist-cjs/lib/options.js +3 -0
  38. package/dist-cjs/lib/options.js.map +2 -2
  39. package/dist-cjs/lib/primitives/Box.js +1 -1
  40. package/dist-cjs/lib/primitives/Box.js.map +2 -2
  41. package/dist-cjs/lib/primitives/geometry/Arc2d.js +2 -2
  42. package/dist-cjs/lib/primitives/geometry/Arc2d.js.map +2 -2
  43. package/dist-cjs/lib/primitives/geometry/Circle2d.js +2 -2
  44. package/dist-cjs/lib/primitives/geometry/Circle2d.js.map +2 -2
  45. package/dist-cjs/lib/primitives/geometry/Ellipse2d.js +2 -2
  46. package/dist-cjs/lib/primitives/geometry/Ellipse2d.js.map +2 -2
  47. package/dist-cjs/lib/primitives/geometry/Geometry2d.js +4 -3
  48. package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
  49. package/dist-cjs/lib/primitives/geometry/Polyline2d.js +1 -1
  50. package/dist-cjs/lib/primitives/geometry/Polyline2d.js.map +2 -2
  51. package/dist-cjs/lib/primitives/geometry/Stadium2d.js +1 -1
  52. package/dist-cjs/lib/primitives/geometry/Stadium2d.js.map +2 -2
  53. package/dist-cjs/lib/utils/getSvgPathFromPoints.js.map +2 -2
  54. package/dist-cjs/lib/utils/sync/TLLocalSyncClient.js +1 -1
  55. package/dist-cjs/lib/utils/sync/TLLocalSyncClient.js.map +2 -2
  56. package/dist-cjs/version.js +3 -3
  57. package/dist-cjs/version.js.map +1 -1
  58. package/dist-esm/index.d.mts +184 -24
  59. package/dist-esm/index.mjs +12 -5
  60. package/dist-esm/index.mjs.map +2 -2
  61. package/dist-esm/lib/TldrawEditor.mjs +4 -2
  62. package/dist-esm/lib/TldrawEditor.mjs.map +2 -2
  63. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +1 -1
  64. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
  65. package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs +1 -1
  66. package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs.map +2 -2
  67. package/dist-esm/lib/config/{createTLUser.mjs → createTLCurrentUser.mjs} +6 -6
  68. package/dist-esm/lib/config/createTLCurrentUser.mjs.map +7 -0
  69. package/dist-esm/lib/config/createTLStore.mjs +28 -2
  70. package/dist-esm/lib/config/createTLStore.mjs.map +2 -2
  71. package/dist-esm/lib/config/defaultShapes.mjs.map +2 -2
  72. package/dist-esm/lib/editor/Editor.mjs +118 -9
  73. package/dist-esm/lib/editor/Editor.mjs.map +3 -3
  74. package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs +1 -1
  75. package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs.map +2 -2
  76. package/dist-esm/lib/editor/managers/SnapManager/BoundsSnaps.mjs +1 -1
  77. package/dist-esm/lib/editor/managers/SnapManager/BoundsSnaps.mjs.map +2 -2
  78. package/dist-esm/lib/editor/managers/SnapManager/HandleSnaps.mjs.map +2 -2
  79. package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs +4 -4
  80. package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs.map +2 -2
  81. package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs +102 -30
  82. package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs.map +2 -2
  83. package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs.map +2 -2
  84. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +10 -0
  85. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
  86. package/dist-esm/lib/exports/StyleEmbedder.mjs +1 -1
  87. package/dist-esm/lib/exports/StyleEmbedder.mjs.map +2 -2
  88. package/dist-esm/lib/exports/getSvgJsx.mjs.map +2 -2
  89. package/dist-esm/lib/hooks/useEditorComponents.mjs.map +2 -2
  90. package/dist-esm/lib/hooks/useGestureEvents.mjs +171 -127
  91. package/dist-esm/lib/hooks/useGestureEvents.mjs.map +3 -3
  92. package/dist-esm/lib/hooks/useLocalStore.mjs.map +2 -2
  93. package/dist-esm/lib/options.mjs +3 -0
  94. package/dist-esm/lib/options.mjs.map +2 -2
  95. package/dist-esm/lib/primitives/Box.mjs +1 -1
  96. package/dist-esm/lib/primitives/Box.mjs.map +2 -2
  97. package/dist-esm/lib/primitives/geometry/Arc2d.mjs +2 -2
  98. package/dist-esm/lib/primitives/geometry/Arc2d.mjs.map +2 -2
  99. package/dist-esm/lib/primitives/geometry/Circle2d.mjs +2 -2
  100. package/dist-esm/lib/primitives/geometry/Circle2d.mjs.map +2 -2
  101. package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs +2 -2
  102. package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs.map +2 -2
  103. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +4 -3
  104. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
  105. package/dist-esm/lib/primitives/geometry/Polyline2d.mjs +1 -1
  106. package/dist-esm/lib/primitives/geometry/Polyline2d.mjs.map +2 -2
  107. package/dist-esm/lib/primitives/geometry/Stadium2d.mjs +1 -1
  108. package/dist-esm/lib/primitives/geometry/Stadium2d.mjs.map +2 -2
  109. package/dist-esm/lib/utils/getSvgPathFromPoints.mjs.map +2 -2
  110. package/dist-esm/lib/utils/sync/TLLocalSyncClient.mjs +1 -1
  111. package/dist-esm/lib/utils/sync/TLLocalSyncClient.mjs.map +2 -2
  112. package/dist-esm/version.mjs +3 -3
  113. package/dist-esm/version.mjs.map +1 -1
  114. package/editor.css +13 -0
  115. package/package.json +8 -9
  116. package/src/index.ts +14 -2
  117. package/src/lib/TldrawEditor.tsx +9 -7
  118. package/src/lib/components/default-components/DefaultCanvas.tsx +1 -1
  119. package/src/lib/components/default-components/DefaultCollaboratorHint.tsx +1 -1
  120. package/src/lib/config/TLEditorSnapshot.test.ts +1 -1
  121. package/src/lib/config/{createTLUser.ts → createTLCurrentUser.ts} +6 -6
  122. package/src/lib/config/createTLStore.ts +36 -2
  123. package/src/lib/config/defaultShapes.ts +1 -1
  124. package/src/lib/editor/Editor.ts +148 -10
  125. package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.ts +1 -1
  126. package/src/lib/editor/managers/SnapManager/BoundsSnaps.ts +1 -1
  127. package/src/lib/editor/managers/SnapManager/HandleSnaps.ts +1 -1
  128. package/src/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.ts +5 -5
  129. package/src/lib/editor/managers/TextManager/TextManager.test.ts +18 -4
  130. package/src/lib/editor/managers/TextManager/TextManager.ts +140 -34
  131. package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.test.ts +2 -2
  132. package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.ts +2 -2
  133. package/src/lib/editor/shapes/ShapeUtil.ts +13 -2
  134. package/src/lib/editor/types/clipboard-types.ts +2 -1
  135. package/src/lib/exports/StyleEmbedder.ts +1 -1
  136. package/src/lib/exports/getSvgJsx.tsx +1 -1
  137. package/src/lib/hooks/useEditorComponents.tsx +1 -1
  138. package/src/lib/hooks/useGestureEvents.ts +240 -168
  139. package/src/lib/hooks/useLocalStore.ts +1 -1
  140. package/src/lib/options.ts +108 -0
  141. package/src/lib/primitives/Box.test.ts +30 -0
  142. package/src/lib/primitives/Box.ts +1 -1
  143. package/src/lib/primitives/geometry/Arc2d.ts +2 -2
  144. package/src/lib/primitives/geometry/Circle2d.ts +2 -2
  145. package/src/lib/primitives/geometry/Ellipse2d.ts +2 -2
  146. package/src/lib/primitives/geometry/Geometry2d.test.ts +21 -0
  147. package/src/lib/primitives/geometry/Geometry2d.ts +4 -3
  148. package/src/lib/primitives/geometry/Polyline2d.ts +1 -1
  149. package/src/lib/primitives/geometry/Stadium2d.ts +1 -1
  150. package/src/lib/utils/getSvgPathFromPoints.ts +1 -1
  151. package/src/lib/utils/sync/TLLocalSyncClient.test.ts +1 -1
  152. package/src/lib/utils/sync/TLLocalSyncClient.ts +1 -1
  153. package/src/version.ts +3 -3
  154. package/dist-cjs/lib/config/createTLUser.js.map +0 -7
  155. package/dist-esm/lib/config/createTLUser.mjs.map +0 -7
@@ -25,8 +25,10 @@ import {
25
25
  PageRecordType,
26
26
  TLDOCUMENT_ID,
27
27
  TLINSTANCE_ID,
28
+ UserRecordType,
28
29
  createBindingId,
29
30
  createShapeId,
31
+ createUserId,
30
32
  getShapePropKeysByStyle,
31
33
  isPageId,
32
34
  isShapeId
@@ -62,13 +64,13 @@ import {
62
64
  uniqueId
63
65
  } from "@tldraw/utils";
64
66
  import EventEmitter from "eventemitter3";
67
+ import { createTLCurrentUser } from "../config/createTLCurrentUser.mjs";
68
+ import { checkBindings } from "../config/defaultBindings.mjs";
69
+ import { checkShapesAndAddCore } from "../config/defaultShapes.mjs";
65
70
  import {
66
71
  getSnapshot,
67
72
  loadSnapshot
68
73
  } from "../config/TLEditorSnapshot.mjs";
69
- import { createTLUser } from "../config/createTLUser.mjs";
70
- import { checkBindings } from "../config/defaultBindings.mjs";
71
- import { checkShapesAndAddCore } from "../config/defaultShapes.mjs";
72
74
  import {
73
75
  DEFAULT_ANIMATION_OPTIONS,
74
76
  DEFAULT_CAMERA_OPTIONS,
@@ -85,13 +87,12 @@ import { tlmenus } from "../globals/menus.mjs";
85
87
  import { tltime } from "../globals/time.mjs";
86
88
  import { defaultTldrawOptions } from "../options.mjs";
87
89
  import { Box } from "../primitives/Box.mjs";
88
- import { Mat } from "../primitives/Mat.mjs";
89
- import { Vec } from "../primitives/Vec.mjs";
90
90
  import { EASINGS } from "../primitives/easings.mjs";
91
91
  import { Group2d } from "../primitives/geometry/Group2d.mjs";
92
92
  import { intersectPolygonPolygon } from "../primitives/intersect.mjs";
93
+ import { Mat } from "../primitives/Mat.mjs";
93
94
  import { PI, approximately, areAnglesCompatible, clamp, pointInPolygon } from "../primitives/utils.mjs";
94
- import { SharedStyleMap } from "../utils/SharedStylesMap.mjs";
95
+ import { Vec } from "../primitives/Vec.mjs";
95
96
  import { areShapesContentEqual } from "../utils/areShapesContentEqual.mjs";
96
97
  import { dataUrlToFile } from "../utils/assets.mjs";
97
98
  import { debugFlags } from "../utils/debug-flags.mjs";
@@ -103,6 +104,7 @@ import { getIncrementedName } from "../utils/getIncrementedName.mjs";
103
104
  import { getReorderingShapesChanges } from "../utils/reorderShapes.mjs";
104
105
  import { getDroppedShapesToNewParents, kickoutOccludedShapes } from "../utils/reparenting.mjs";
105
106
  import { applyRotationToSnapshotShapes, getRotationSnapshot } from "../utils/rotation.mjs";
107
+ import { SharedStyleMap } from "../utils/SharedStylesMap.mjs";
106
108
  import { bindingsIndex } from "./derivations/bindingsIndex.mjs";
107
109
  import { notVisibleShapes } from "./derivations/notVisibleShapes.mjs";
108
110
  import { parentsToChildren } from "./derivations/parentsToChildren.mjs";
@@ -164,13 +166,17 @@ class Editor extends EventEmitter {
164
166
  ...options?.camera
165
167
  });
166
168
  this._textOptions = atom("text options", options?.text ?? null);
167
- this.user = new UserPreferencesManager(user ?? createTLUser(), inferDarkMode ?? false);
169
+ this.user = new UserPreferencesManager(user ?? createTLCurrentUser(), inferDarkMode ?? false);
168
170
  this.disposables.add(() => this.user.dispose());
169
171
  this.getContainer = getContainer;
170
172
  this.textMeasure = new TextManager(this);
171
173
  this.disposables.add(() => this.textMeasure.dispose());
172
174
  this.fonts = new FontManager(this, fontAssetUrls);
173
175
  this._tickManager = new TickManager(this);
176
+ this.disposables.add(() => {
177
+ this.off("tick", this._decayCameraStateTimeout);
178
+ this._setCameraState("idle");
179
+ });
174
180
  this.inputs = new InputsManager(this);
175
181
  class NewRoot extends RootState {
176
182
  static initial = initialState ?? "";
@@ -547,6 +553,14 @@ class Editor extends EventEmitter {
547
553
  })
548
554
  );
549
555
  }
556
+ this.disposables.add(
557
+ react("sync current user record", () => {
558
+ const user2 = this.store.props.users.currentUser.get();
559
+ if (user2) {
560
+ this._ensureUserRecord(user2);
561
+ }
562
+ })
563
+ );
550
564
  }
551
565
  _getShapeVisibility;
552
566
  getIsShapeHiddenCache() {
@@ -2853,6 +2867,76 @@ class Editor extends EventEmitter {
2853
2867
  const currentPageId = this.getCurrentPageId();
2854
2868
  return this.getCollaborators().filter((c) => c.currentPageId === currentPageId);
2855
2869
  }
2870
+ // Attribution
2871
+ /**
2872
+ * Get the current user's ID for attribution purposes.
2873
+ * Also ensures a `user:` record exists in the store for the current user.
2874
+ * Returns `null` when the user store has no current user.
2875
+ *
2876
+ * @public
2877
+ */
2878
+ getAttributionUserId() {
2879
+ const user = this.store.props.users.currentUser.get();
2880
+ if (!user) return null;
2881
+ this._ensureUserRecord(user);
2882
+ return UserRecordType.parseId(user.id);
2883
+ }
2884
+ /**
2885
+ * Ensure a user record exists in the store for the given user,
2886
+ * updating it if the data has changed.
2887
+ *
2888
+ * @internal
2889
+ */
2890
+ _ensureUserRecord(user) {
2891
+ const existing = this.store.get(user.id);
2892
+ if (existing && existing.name === user.name && existing.color === user.color && existing.imageUrl === user.imageUrl && existing.meta === user.meta) {
2893
+ return;
2894
+ }
2895
+ this.run(
2896
+ () => {
2897
+ this.store.put([user]);
2898
+ },
2899
+ { history: "ignore" }
2900
+ );
2901
+ }
2902
+ /**
2903
+ * Resolve a display name for a user ID. Asks the
2904
+ * {@link @tldraw/tlschema#TLUserStore} first (the app's source of truth),
2905
+ * falling back to the `user:` record in the store.
2906
+ *
2907
+ * @public
2908
+ */
2909
+ getAttributionDisplayName(userId) {
2910
+ if (!userId) return null;
2911
+ return this.store.props.users.resolve(userId).get()?.name ?? this.store.get(createUserId(userId))?.name ?? null;
2912
+ }
2913
+ /**
2914
+ * Resolve a user record by ID. Asks the
2915
+ * {@link @tldraw/tlschema#TLUserStore} first (the app's source of truth),
2916
+ * falling back to the `user:` record in the store.
2917
+ *
2918
+ * @public
2919
+ */
2920
+ getAttributionUser(userId) {
2921
+ if (!userId) return null;
2922
+ return this.store.props.users.resolve(userId).get() ?? this.store.get(createUserId(userId)) ?? null;
2923
+ }
2924
+ /**
2925
+ * Collect user IDs referenced by a set of shapes via shape-specific props
2926
+ * (e.g. `textFirstEditedBy` on notes).
2927
+ *
2928
+ * @internal
2929
+ */
2930
+ _getReferencedUserIds(shapes) {
2931
+ const userIds = /* @__PURE__ */ new Set();
2932
+ for (const shape of shapes) {
2933
+ const util = this.getShapeUtil(shape);
2934
+ for (const id of util.getReferencedUserIds(shape)) {
2935
+ userIds.add(id);
2936
+ }
2937
+ }
2938
+ return userIds;
2939
+ }
2856
2940
  // Following
2857
2941
  // When we are 'locked on' to a user, our camera is derived from their camera.
2858
2942
  _isLockedOnFollowingUser = atom("isLockedOnFollowingUser", false);
@@ -6566,12 +6650,22 @@ class Editor extends EventEmitter {
6566
6650
  if (!asset) continue;
6567
6651
  assets.push(asset);
6568
6652
  }
6653
+ const users = [];
6654
+ const seenUserIds = /* @__PURE__ */ new Set();
6655
+ for (const userId of this._getReferencedUserIds(shapes2)) {
6656
+ const recordId = createUserId(userId);
6657
+ if (seenUserIds.has(recordId)) continue;
6658
+ seenUserIds.add(recordId);
6659
+ const user = this.store.get(recordId);
6660
+ if (user) users.push(user);
6661
+ }
6569
6662
  return {
6570
6663
  schema: this.store.schema.serialize(),
6571
6664
  shapes: shapes2,
6572
6665
  rootShapeIds,
6573
6666
  bindings,
6574
- assets
6667
+ assets,
6668
+ users
6575
6669
  };
6576
6670
  });
6577
6671
  }
@@ -6621,13 +6715,15 @@ class Editor extends EventEmitter {
6621
6715
  const assets = [];
6622
6716
  const shapes = [];
6623
6717
  const bindings = [];
6718
+ const users = [];
6624
6719
  const store = {
6625
6720
  store: {
6626
6721
  ...Object.fromEntries(content.assets.map((asset) => [asset.id, asset])),
6627
6722
  ...Object.fromEntries(content.shapes.map((shape) => [shape.id, shape])),
6628
6723
  ...Object.fromEntries(
6629
6724
  content.bindings?.map((bindings2) => [bindings2.id, bindings2]) ?? []
6630
- )
6725
+ ),
6726
+ ...Object.fromEntries(content.users?.map((user) => [user.id, user]) ?? [])
6631
6727
  },
6632
6728
  schema: content.schema
6633
6729
  };
@@ -6649,6 +6745,19 @@ class Editor extends EventEmitter {
6649
6745
  bindings.push(record);
6650
6746
  break;
6651
6747
  }
6748
+ case "user": {
6749
+ users.push(record);
6750
+ break;
6751
+ }
6752
+ }
6753
+ }
6754
+ if (users.length > 0) {
6755
+ const existingUserIds = new Set(
6756
+ this.store.allRecords().filter((r) => r.typeName === "user").map((r) => r.id)
6757
+ );
6758
+ const usersToCreate = users.filter((u) => !existingUserIds.has(u.id));
6759
+ if (usersToCreate.length > 0) {
6760
+ this.store.put(usersToCreate);
6652
6761
  }
6653
6762
  }
6654
6763
  const shapeIdMap = new Map(