@tldraw/editor 3.16.0-canary.f60032f16651 → 3.16.0-canary.fa03b5a9ad13

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 (207) hide show
  1. package/dist-cjs/index.d.ts +119 -105
  2. package/dist-cjs/index.js +3 -5
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/TldrawEditor.js +6 -8
  5. package/dist-cjs/lib/TldrawEditor.js.map +2 -2
  6. package/dist-cjs/lib/components/Shape.js +7 -10
  7. package/dist-cjs/lib/components/Shape.js.map +2 -2
  8. package/dist-cjs/lib/components/default-components/DefaultCanvas.js +14 -23
  9. package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
  10. package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js +1 -1
  11. package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js.map +1 -1
  12. package/dist-cjs/lib/components/default-components/DefaultErrorFallback.js +1 -1
  13. package/dist-cjs/lib/components/default-components/DefaultErrorFallback.js.map +2 -2
  14. package/dist-cjs/lib/components/default-components/DefaultScribble.js +1 -1
  15. package/dist-cjs/lib/components/default-components/DefaultScribble.js.map +2 -2
  16. package/dist-cjs/lib/components/default-components/DefaultShapeIndicator.js +9 -1
  17. package/dist-cjs/lib/components/default-components/DefaultShapeIndicator.js.map +2 -2
  18. package/dist-cjs/lib/config/TLUserPreferences.js +9 -3
  19. package/dist-cjs/lib/config/TLUserPreferences.js.map +2 -2
  20. package/dist-cjs/lib/editor/Editor.js +96 -128
  21. package/dist-cjs/lib/editor/Editor.js.map +2 -2
  22. package/dist-cjs/lib/editor/derivations/notVisibleShapes.js +4 -0
  23. package/dist-cjs/lib/editor/derivations/notVisibleShapes.js.map +2 -2
  24. package/dist-cjs/lib/editor/managers/FocusManager/FocusManager.js +4 -2
  25. package/dist-cjs/lib/editor/managers/FocusManager/FocusManager.js.map +2 -2
  26. package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js +9 -4
  27. package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js.map +2 -2
  28. package/dist-cjs/lib/editor/shapes/ShapeUtil.js +23 -0
  29. package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
  30. package/dist-cjs/lib/editor/types/misc-types.js.map +1 -1
  31. package/dist-cjs/lib/exports/getSvgJsx.js +35 -16
  32. package/dist-cjs/lib/exports/getSvgJsx.js.map +2 -2
  33. package/dist-cjs/lib/hooks/useCanvasEvents.js +26 -21
  34. package/dist-cjs/lib/hooks/useCanvasEvents.js.map +2 -2
  35. package/dist-cjs/lib/hooks/useDocumentEvents.js +5 -5
  36. package/dist-cjs/lib/hooks/useDocumentEvents.js.map +2 -2
  37. package/dist-cjs/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.js +1 -2
  38. package/dist-cjs/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.js.map +2 -2
  39. package/dist-cjs/lib/hooks/useGestureEvents.js +1 -1
  40. package/dist-cjs/lib/hooks/useGestureEvents.js.map +2 -2
  41. package/dist-cjs/lib/hooks/useHandleEvents.js +6 -6
  42. package/dist-cjs/lib/hooks/useHandleEvents.js.map +2 -2
  43. package/dist-cjs/lib/hooks/usePassThroughMouseOverEvents.js +4 -1
  44. package/dist-cjs/lib/hooks/usePassThroughMouseOverEvents.js.map +2 -2
  45. package/dist-cjs/lib/hooks/usePassThroughWheelEvents.js +4 -1
  46. package/dist-cjs/lib/hooks/usePassThroughWheelEvents.js.map +2 -2
  47. package/dist-cjs/lib/hooks/useSelectionEvents.js +8 -8
  48. package/dist-cjs/lib/hooks/useSelectionEvents.js.map +2 -2
  49. package/dist-cjs/lib/license/LicenseManager.js +143 -53
  50. package/dist-cjs/lib/license/LicenseManager.js.map +2 -2
  51. package/dist-cjs/lib/license/LicenseProvider.js +39 -1
  52. package/dist-cjs/lib/license/LicenseProvider.js.map +2 -2
  53. package/dist-cjs/lib/license/Watermark.js +144 -75
  54. package/dist-cjs/lib/license/Watermark.js.map +3 -3
  55. package/dist-cjs/lib/license/useLicenseManagerState.js.map +2 -2
  56. package/dist-cjs/lib/options.js +7 -0
  57. package/dist-cjs/lib/options.js.map +2 -2
  58. package/dist-cjs/lib/primitives/Box.js +3 -0
  59. package/dist-cjs/lib/primitives/Box.js.map +2 -2
  60. package/dist-cjs/lib/primitives/Vec.js +0 -4
  61. package/dist-cjs/lib/primitives/Vec.js.map +2 -2
  62. package/dist-cjs/lib/primitives/geometry/Geometry2d.js +50 -20
  63. package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
  64. package/dist-cjs/lib/primitives/geometry/Group2d.js +8 -1
  65. package/dist-cjs/lib/primitives/geometry/Group2d.js.map +2 -2
  66. package/dist-cjs/lib/utils/dom.js.map +2 -2
  67. package/dist-cjs/lib/utils/getPointerInfo.js +2 -3
  68. package/dist-cjs/lib/utils/getPointerInfo.js.map +2 -2
  69. package/dist-cjs/lib/utils/reparenting.js +7 -36
  70. package/dist-cjs/lib/utils/reparenting.js.map +3 -3
  71. package/dist-cjs/version.js +3 -3
  72. package/dist-cjs/version.js.map +1 -1
  73. package/dist-esm/index.d.mts +119 -105
  74. package/dist-esm/index.mjs +3 -5
  75. package/dist-esm/index.mjs.map +2 -2
  76. package/dist-esm/lib/TldrawEditor.mjs +6 -8
  77. package/dist-esm/lib/TldrawEditor.mjs.map +2 -2
  78. package/dist-esm/lib/components/Shape.mjs +7 -10
  79. package/dist-esm/lib/components/Shape.mjs.map +2 -2
  80. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +14 -23
  81. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
  82. package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs +1 -1
  83. package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs.map +1 -1
  84. package/dist-esm/lib/components/default-components/DefaultErrorFallback.mjs +1 -1
  85. package/dist-esm/lib/components/default-components/DefaultErrorFallback.mjs.map +2 -2
  86. package/dist-esm/lib/components/default-components/DefaultScribble.mjs +1 -1
  87. package/dist-esm/lib/components/default-components/DefaultScribble.mjs.map +2 -2
  88. package/dist-esm/lib/components/default-components/DefaultShapeIndicator.mjs +9 -1
  89. package/dist-esm/lib/components/default-components/DefaultShapeIndicator.mjs.map +2 -2
  90. package/dist-esm/lib/config/TLUserPreferences.mjs +9 -3
  91. package/dist-esm/lib/config/TLUserPreferences.mjs.map +2 -2
  92. package/dist-esm/lib/editor/Editor.mjs +96 -128
  93. package/dist-esm/lib/editor/Editor.mjs.map +2 -2
  94. package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs +4 -0
  95. package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs.map +2 -2
  96. package/dist-esm/lib/editor/managers/FocusManager/FocusManager.mjs +4 -2
  97. package/dist-esm/lib/editor/managers/FocusManager/FocusManager.mjs.map +2 -2
  98. package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs +9 -4
  99. package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs.map +2 -2
  100. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +23 -0
  101. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
  102. package/dist-esm/lib/exports/getSvgJsx.mjs +36 -16
  103. package/dist-esm/lib/exports/getSvgJsx.mjs.map +2 -2
  104. package/dist-esm/lib/hooks/useCanvasEvents.mjs +27 -27
  105. package/dist-esm/lib/hooks/useCanvasEvents.mjs.map +2 -2
  106. package/dist-esm/lib/hooks/useDocumentEvents.mjs +6 -6
  107. package/dist-esm/lib/hooks/useDocumentEvents.mjs.map +2 -2
  108. package/dist-esm/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.mjs +1 -2
  109. package/dist-esm/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.mjs.map +2 -2
  110. package/dist-esm/lib/hooks/useGestureEvents.mjs +2 -2
  111. package/dist-esm/lib/hooks/useGestureEvents.mjs.map +2 -2
  112. package/dist-esm/lib/hooks/useHandleEvents.mjs +6 -6
  113. package/dist-esm/lib/hooks/useHandleEvents.mjs.map +2 -2
  114. package/dist-esm/lib/hooks/usePassThroughMouseOverEvents.mjs +4 -1
  115. package/dist-esm/lib/hooks/usePassThroughMouseOverEvents.mjs.map +2 -2
  116. package/dist-esm/lib/hooks/usePassThroughWheelEvents.mjs +4 -1
  117. package/dist-esm/lib/hooks/usePassThroughWheelEvents.mjs.map +2 -2
  118. package/dist-esm/lib/hooks/useSelectionEvents.mjs +9 -14
  119. package/dist-esm/lib/hooks/useSelectionEvents.mjs.map +2 -2
  120. package/dist-esm/lib/license/LicenseManager.mjs +144 -54
  121. package/dist-esm/lib/license/LicenseManager.mjs.map +2 -2
  122. package/dist-esm/lib/license/LicenseProvider.mjs +39 -2
  123. package/dist-esm/lib/license/LicenseProvider.mjs.map +2 -2
  124. package/dist-esm/lib/license/Watermark.mjs +145 -76
  125. package/dist-esm/lib/license/Watermark.mjs.map +3 -3
  126. package/dist-esm/lib/license/useLicenseManagerState.mjs.map +2 -2
  127. package/dist-esm/lib/options.mjs +7 -0
  128. package/dist-esm/lib/options.mjs.map +2 -2
  129. package/dist-esm/lib/primitives/Box.mjs +4 -1
  130. package/dist-esm/lib/primitives/Box.mjs.map +2 -2
  131. package/dist-esm/lib/primitives/Vec.mjs +0 -4
  132. package/dist-esm/lib/primitives/Vec.mjs.map +2 -2
  133. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +53 -21
  134. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
  135. package/dist-esm/lib/primitives/geometry/Group2d.mjs +8 -1
  136. package/dist-esm/lib/primitives/geometry/Group2d.mjs.map +2 -2
  137. package/dist-esm/lib/utils/dom.mjs.map +2 -2
  138. package/dist-esm/lib/utils/getPointerInfo.mjs +2 -3
  139. package/dist-esm/lib/utils/getPointerInfo.mjs.map +2 -2
  140. package/dist-esm/lib/utils/reparenting.mjs +8 -41
  141. package/dist-esm/lib/utils/reparenting.mjs.map +2 -2
  142. package/dist-esm/version.mjs +3 -3
  143. package/dist-esm/version.mjs.map +1 -1
  144. package/editor.css +308 -290
  145. package/package.json +14 -37
  146. package/src/index.ts +2 -9
  147. package/src/lib/TldrawEditor.tsx +7 -16
  148. package/src/lib/components/Shape.tsx +6 -12
  149. package/src/lib/components/default-components/DefaultCanvas.tsx +11 -22
  150. package/src/lib/components/default-components/DefaultCollaboratorHint.tsx +1 -1
  151. package/src/lib/components/default-components/DefaultErrorFallback.tsx +1 -1
  152. package/src/lib/components/default-components/DefaultScribble.tsx +1 -1
  153. package/src/lib/components/default-components/DefaultShapeIndicator.tsx +5 -1
  154. package/src/lib/config/TLUserPreferences.ts +8 -1
  155. package/src/lib/editor/Editor.test.ts +102 -11
  156. package/src/lib/editor/Editor.ts +124 -170
  157. package/src/lib/editor/derivations/notVisibleShapes.ts +6 -0
  158. package/src/lib/editor/managers/ClickManager/ClickManager.test.ts +15 -14
  159. package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.test.ts +16 -15
  160. package/src/lib/editor/managers/FocusManager/FocusManager.test.ts +49 -48
  161. package/src/lib/editor/managers/FocusManager/FocusManager.ts +6 -2
  162. package/src/lib/editor/managers/FontManager/FontManager.test.ts +24 -23
  163. package/src/lib/editor/managers/HistoryManager/HistoryManager.test.ts +7 -6
  164. package/src/lib/editor/managers/ScribbleManager/ScribbleManager.test.ts +12 -11
  165. package/src/lib/editor/managers/SnapManager/SnapManager.test.ts +57 -50
  166. package/src/lib/editor/managers/TextManager/TextManager.test.ts +51 -26
  167. package/src/lib/editor/managers/TickManager/TickManager.test.ts +14 -13
  168. package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.test.ts +34 -26
  169. package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.ts +6 -1
  170. package/src/lib/editor/shapes/ShapeUtil.ts +46 -0
  171. package/src/lib/editor/types/misc-types.ts +0 -6
  172. package/src/lib/exports/getSvgJsx.test.ts +868 -0
  173. package/src/lib/exports/getSvgJsx.tsx +78 -21
  174. package/src/lib/hooks/useCanvasEvents.ts +26 -26
  175. package/src/lib/hooks/useDocumentEvents.ts +6 -6
  176. package/src/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.ts +1 -1
  177. package/src/lib/hooks/useGestureEvents.ts +2 -2
  178. package/src/lib/hooks/useHandleEvents.ts +6 -6
  179. package/src/lib/hooks/usePassThroughMouseOverEvents.ts +4 -1
  180. package/src/lib/hooks/usePassThroughWheelEvents.ts +6 -1
  181. package/src/lib/hooks/useSelectionEvents.ts +9 -14
  182. package/src/lib/license/LicenseManager.test.ts +724 -383
  183. package/src/lib/license/LicenseManager.ts +204 -58
  184. package/src/lib/license/LicenseProvider.tsx +74 -2
  185. package/src/lib/license/Watermark.test.tsx +2 -1
  186. package/src/lib/license/Watermark.tsx +152 -77
  187. package/src/lib/license/useLicenseManagerState.ts +2 -2
  188. package/src/lib/options.ts +8 -0
  189. package/src/lib/primitives/Box.test.ts +126 -0
  190. package/src/lib/primitives/Box.ts +10 -1
  191. package/src/lib/primitives/Vec.ts +0 -5
  192. package/src/lib/primitives/geometry/Geometry2d.test.ts +420 -0
  193. package/src/lib/primitives/geometry/Geometry2d.ts +78 -21
  194. package/src/lib/primitives/geometry/Group2d.ts +10 -1
  195. package/src/lib/test/InFrontOfTheCanvas.test.tsx +187 -0
  196. package/src/lib/utils/dom.test.ts +103 -0
  197. package/src/lib/utils/dom.ts +8 -1
  198. package/src/lib/utils/getPointerInfo.ts +3 -2
  199. package/src/lib/utils/reparenting.ts +10 -70
  200. package/src/lib/utils/sync/LocalIndexedDb.test.ts +2 -1
  201. package/src/lib/utils/sync/TLLocalSyncClient.test.ts +15 -15
  202. package/src/version.ts +3 -3
  203. package/dist-cjs/lib/utils/nearestMultiple.js +0 -34
  204. package/dist-cjs/lib/utils/nearestMultiple.js.map +0 -7
  205. package/dist-esm/lib/utils/nearestMultiple.mjs +0 -14
  206. package/dist-esm/lib/utils/nearestMultiple.mjs.map +0 -7
  207. package/src/lib/utils/nearestMultiple.ts +0 -13
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@tldraw/editor",
3
3
  "description": "tldraw infinite canvas SDK (editor).",
4
- "version": "3.16.0-canary.f60032f16651",
4
+ "version": "3.16.0-canary.fa03b5a9ad13",
5
5
  "author": {
6
6
  "name": "tldraw Inc.",
7
7
  "email": "hello@tldraw.com"
@@ -34,27 +34,28 @@
34
34
  "src"
35
35
  ],
36
36
  "scripts": {
37
- "test-ci": "lazy inherit",
38
- "test": "yarn run -T jest",
37
+ "test-ci": "yarn run -T vitest run --passWithNoTests",
38
+ "test": "yarn run -T vitest --passWithNoTests",
39
39
  "benchmark": "yarn run -T tsx ./internal/scripts/benchmark.ts",
40
- "test-coverage": "lazy inherit",
40
+ "test-coverage": "yarn run -T vitest run --coverage --passWithNoTests",
41
41
  "build": "yarn run -T tsx ../../internal/scripts/build-package.ts",
42
42
  "build-api": "yarn run -T tsx ../../internal/scripts/build-api.ts",
43
43
  "prepack": "yarn run -T tsx ../../internal/scripts/prepack.ts",
44
44
  "postpack": "../../internal/scripts/postpack.sh",
45
45
  "pack-tarball": "yarn pack",
46
- "lint": "yarn run -T tsx ../../internal/scripts/lint.ts"
46
+ "lint": "yarn run -T tsx ../../internal/scripts/lint.ts",
47
+ "context": "yarn run -T tsx ../../internal/scripts/context.ts"
47
48
  },
48
49
  "dependencies": {
49
50
  "@tiptap/core": "^2.9.1",
50
51
  "@tiptap/pm": "^2.9.1",
51
52
  "@tiptap/react": "^2.9.1",
52
- "@tldraw/state": "3.16.0-canary.f60032f16651",
53
- "@tldraw/state-react": "3.16.0-canary.f60032f16651",
54
- "@tldraw/store": "3.16.0-canary.f60032f16651",
55
- "@tldraw/tlschema": "3.16.0-canary.f60032f16651",
56
- "@tldraw/utils": "3.16.0-canary.f60032f16651",
57
- "@tldraw/validate": "3.16.0-canary.f60032f16651",
53
+ "@tldraw/state": "3.16.0-canary.fa03b5a9ad13",
54
+ "@tldraw/state-react": "3.16.0-canary.fa03b5a9ad13",
55
+ "@tldraw/store": "3.16.0-canary.fa03b5a9ad13",
56
+ "@tldraw/tlschema": "3.16.0-canary.fa03b5a9ad13",
57
+ "@tldraw/utils": "3.16.0-canary.fa03b5a9ad13",
58
+ "@tldraw/validate": "3.16.0-canary.fa03b5a9ad13",
58
59
  "@types/core-js": "^2.5.8",
59
60
  "@use-gesture/react": "^10.3.1",
60
61
  "classnames": "^2.5.1",
@@ -69,41 +70,17 @@
69
70
  },
70
71
  "devDependencies": {
71
72
  "@peculiar/webcrypto": "^1.5.0",
72
- "@testing-library/jest-dom": "^5.17.0",
73
73
  "@testing-library/react": "^15.0.7",
74
74
  "@types/benchmark": "^2.1.5",
75
75
  "@types/react": "^18.3.18",
76
76
  "@types/wicg-file-system-access": "^2020.9.8",
77
77
  "benchmark": "^2.1.4",
78
78
  "fake-indexeddb": "^4.0.2",
79
- "jest-canvas-mock": "^2.5.2",
80
- "jest-environment-jsdom": "^29.7.0",
81
79
  "lazyrepo": "0.0.0-alpha.27",
82
80
  "react": "^18.3.1",
83
81
  "react-dom": "^18.3.1",
84
- "resize-observer-polyfill": "^1.5.1"
85
- },
86
- "jest": {
87
- "preset": "../../internal/config/jest/node/jest-preset.js",
88
- "testEnvironment": "../../../packages/utils/patchedJestJsDom.js",
89
- "fakeTimers": {
90
- "enableGlobally": true
91
- },
92
- "testPathIgnorePatterns": [
93
- "^.+\\.*.css$"
94
- ],
95
- "moduleNameMapper": {
96
- "^~(.*)": "<rootDir>/src/$1",
97
- "\\.(css|less|scss|sass)$": "identity-obj-proxy"
98
- },
99
- "setupFiles": [
100
- "raf/polyfill",
101
- "jest-canvas-mock",
102
- "<rootDir>/setupTests.js"
103
- ],
104
- "setupFilesAfterEnv": [
105
- "../../internal/config/setupJest.ts"
106
- ]
82
+ "resize-observer-polyfill": "^1.5.1",
83
+ "vitest": "^3.2.4"
107
84
  },
108
85
  "module": "dist-esm/index.mjs",
109
86
  "source": "src/index.ts",
package/src/index.ts CHANGED
@@ -268,7 +268,6 @@ export {
268
268
  type TLGetShapeAtPointOptions,
269
269
  type TLImageExportOptions,
270
270
  type TLSvgExportOptions,
271
- type TLSvgOptions,
272
271
  type TLUpdatePointerOptions,
273
272
  } from './lib/editor/types/misc-types'
274
273
  export {
@@ -331,9 +330,11 @@ export {
331
330
  type InvalidLicenseReason,
332
331
  type LicenseFromKeyResult,
333
332
  type LicenseInfo,
333
+ type LicenseState,
334
334
  type TestEnvironment,
335
335
  type ValidLicenseKeyResult,
336
336
  } from './lib/license/LicenseManager'
337
+ export { LICENSE_TIMEOUT } from './lib/license/LicenseProvider'
337
338
  export { defaultTldrawOptions, type TldrawOptions } from './lib/options'
338
339
  export {
339
340
  Box,
@@ -485,14 +486,6 @@ export { type TLStoreWithStatus } from './lib/utils/sync/StoreWithStatus'
485
486
  export { uniq } from './lib/utils/uniq'
486
487
  export { openWindow } from './lib/utils/window-open'
487
488
 
488
- /**
489
- * @deprecated Licensing is now enabled in the tldraw SDK.
490
- * @public */
491
- export function debugEnableLicensing() {
492
- // noop
493
- return
494
- }
495
-
496
489
  registerTldrawLibraryVersion(
497
490
  (globalThis as any).TLDRAW_LIBRARY_NAME,
498
491
  (globalThis as any).TLDRAW_LIBRARY_VERSION,
@@ -1,6 +1,7 @@
1
1
  import { MigrationSequence, Store } from '@tldraw/store'
2
2
  import { TLShape, TLStore, TLStoreSnapshot } from '@tldraw/tlschema'
3
3
  import { annotateError, Required } from '@tldraw/utils'
4
+ import classNames from 'classnames'
4
5
  import React, {
5
6
  memo,
6
7
  ReactNode,
@@ -12,8 +13,6 @@ import React, {
12
13
  useState,
13
14
  useSyncExternalStore,
14
15
  } from 'react'
15
-
16
- import classNames from 'classnames'
17
16
  import { version } from '../version'
18
17
  import { DefaultErrorFallback } from './components/default-components/DefaultErrorFallback'
19
18
  import { OptionalErrorBoundary } from './components/ErrorBoundary'
@@ -45,7 +44,6 @@ import { LicenseProvider } from './license/LicenseProvider'
45
44
  import { Watermark } from './license/Watermark'
46
45
  import { TldrawOptions } from './options'
47
46
  import { TLDeepLinkOptions } from './utils/deepLinks'
48
- import { stopEventPropagation } from './utils/dom'
49
47
  import { TLTextOptions } from './utils/richText'
50
48
  import { TLStoreWithStatus } from './utils/sync/StoreWithStatus'
51
49
 
@@ -189,13 +187,6 @@ export interface TldrawEditorBaseProps {
189
187
  */
190
188
  deepLinks?: true | TLDeepLinkOptions
191
189
 
192
- /**
193
- * Predicate for whether or not a shape should be hidden.
194
- *
195
- * @deprecated Use {@link TldrawEditorBaseProps#getShapeVisibility} instead.
196
- */
197
- isShapeHidden?(shape: TLShape, editor: Editor): boolean
198
-
199
190
  /**
200
191
  * Provides a way to hide shapes.
201
192
  *
@@ -283,7 +274,6 @@ export const TldrawEditor = memo(function TldrawEditor({
283
274
  data-tldraw={version}
284
275
  draggable={false}
285
276
  className={classNames(`${TL_CONTAINER_CLASS} tl-theme__light`, className)}
286
- onPointerDown={stopEventPropagation}
287
277
  tabIndex={-1}
288
278
  role="application"
289
279
  aria-label={_options?.branding ?? 'tldraw'}
@@ -412,8 +402,6 @@ function TldrawEditorWithReadyStore({
412
402
  options,
413
403
  licenseKey,
414
404
  deepLinks: _deepLinks,
415
- // eslint-disable-next-line @typescript-eslint/no-deprecated
416
- isShapeHidden,
417
405
  getShapeVisibility,
418
406
  assetUrls,
419
407
  }: Required<
@@ -473,7 +461,6 @@ function TldrawEditorWithReadyStore({
473
461
  textOptions,
474
462
  options,
475
463
  licenseKey,
476
- isShapeHidden,
477
464
  getShapeVisibility,
478
465
  fontAssetUrls: assetUrls?.fonts,
479
466
  })
@@ -509,7 +496,6 @@ function TldrawEditorWithReadyStore({
509
496
  user,
510
497
  setEditor,
511
498
  licenseKey,
512
- isShapeHidden,
513
499
  getShapeVisibility,
514
500
  textOptions,
515
501
  assetUrls,
@@ -586,8 +572,13 @@ function TldrawEditorWithReadyStore({
586
572
  if (editor !== fontLoadingState?.editor) {
587
573
  fontLoadingState = null
588
574
  }
589
- useEffect(() => {
575
+ useLayoutEffect(() => {
590
576
  if (!editor) return
577
+ if (editor.options.maxFontsToLoadBeforeRender === 0) {
578
+ setFontLoadingState({ editor, isLoaded: true })
579
+ return
580
+ }
581
+
591
582
  let isCancelled = false
592
583
 
593
584
  setFontLoadingState({ editor, isLoaded: false })
@@ -28,7 +28,6 @@ export const Shape = memo(function Shape({
28
28
  index,
29
29
  backgroundIndex,
30
30
  opacity,
31
- dprMultiple,
32
31
  }: {
33
32
  id: TLShapeId
34
33
  shape: TLShape
@@ -36,7 +35,6 @@ export const Shape = memo(function Shape({
36
35
  index: number
37
36
  backgroundIndex: number
38
37
  opacity: number
39
- dprMultiple: number
40
38
  }) {
41
39
  const editor = useEditor()
42
40
 
@@ -91,18 +89,14 @@ export const Shape = memo(function Shape({
91
89
  }
92
90
 
93
91
  // Width / Height
94
- // We round the shape width and height up to the nearest multiple of dprMultiple
95
- // to avoid the browser making miscalculations when applying the transform.
96
- const widthRemainder = bounds.w % dprMultiple
97
- const heightRemainder = bounds.h % dprMultiple
98
- const width = widthRemainder === 0 ? bounds.w : bounds.w + (dprMultiple - widthRemainder)
99
- const height = heightRemainder === 0 ? bounds.h : bounds.h + (dprMultiple - heightRemainder)
92
+ const width = Math.max(bounds.width, 1)
93
+ const height = Math.max(bounds.height, 1)
100
94
 
101
95
  if (width !== prev.width || height !== prev.height) {
102
- setStyleProperty(containerRef.current, 'width', Math.max(width, dprMultiple) + 'px')
103
- setStyleProperty(containerRef.current, 'height', Math.max(height, dprMultiple) + 'px')
104
- setStyleProperty(bgContainerRef.current, 'width', Math.max(width, dprMultiple) + 'px')
105
- setStyleProperty(bgContainerRef.current, 'height', Math.max(height, dprMultiple) + 'px')
96
+ setStyleProperty(containerRef.current, 'width', width + 'px')
97
+ setStyleProperty(containerRef.current, 'height', height + 'px')
98
+ setStyleProperty(bgContainerRef.current, 'width', width + 'px')
99
+ setStyleProperty(bgContainerRef.current, 'height', height + 'px')
106
100
  prev.width = width
107
101
  prev.height = height
108
102
  }
@@ -22,7 +22,6 @@ import { Vec } from '../../primitives/Vec'
22
22
  import { toDomPrecision } from '../../primitives/utils'
23
23
  import { debugFlags } from '../../utils/debug-flags'
24
24
  import { setStyleProperty } from '../../utils/dom'
25
- import { nearestMultiple } from '../../utils/nearestMultiple'
26
25
  import { GeometryDebuggingView } from '../GeometryDebuggingView'
27
26
  import { LiveCollaborators } from '../LiveCollaborators'
28
27
  import { MenuClickCapture } from '../MenuClickCapture'
@@ -173,10 +172,18 @@ export function DefaultCanvas({ className }: TLCanvasComponentProps) {
173
172
  <LiveCollaborators />
174
173
  </div>
175
174
  </div>
175
+ <div
176
+ className="tl-canvas__in-front"
177
+ onPointerDown={editor.markEventAsHandled}
178
+ onPointerUp={editor.markEventAsHandled}
179
+ onTouchStart={editor.markEventAsHandled}
180
+ onTouchEnd={editor.markEventAsHandled}
181
+ >
182
+ <InFrontOfTheCanvasWrapper />
183
+ </div>
176
184
  <MovingCameraHitTestBlocker />
177
185
  </div>
178
186
  <MenuClickCapture />
179
- <InFrontOfTheCanvasWrapper />
180
187
  </>
181
188
  )
182
189
  }
@@ -390,18 +397,9 @@ function ShapesWithSVGs() {
390
397
 
391
398
  const renderingShapes = useValue('rendering shapes', () => editor.getRenderingShapes(), [editor])
392
399
 
393
- const dprMultiple = useValue(
394
- 'dpr multiple',
395
- () =>
396
- // dprMultiple is the smallest number we can multiply dpr by to get an integer
397
- // it's usually 1, 2, or 4 (for e.g. dpr of 2, 2.5 and 2.25 respectively)
398
- nearestMultiple(Math.floor(editor.getInstanceState().devicePixelRatio * 100) / 100),
399
- [editor]
400
- )
401
-
402
400
  return renderingShapes.map((result) => (
403
401
  <Fragment key={result.id + '_fragment'}>
404
- <Shape {...result} dprMultiple={dprMultiple} />
402
+ <Shape {...result} />
405
403
  <DebugSvgCopy id={result.id} mode="iframe" />
406
404
  </Fragment>
407
405
  ))
@@ -436,19 +434,10 @@ function ShapesToDisplay() {
436
434
 
437
435
  const renderingShapes = useValue('rendering shapes', () => editor.getRenderingShapes(), [editor])
438
436
 
439
- const dprMultiple = useValue(
440
- 'dpr multiple',
441
- () =>
442
- // dprMultiple is the smallest number we can multiply dpr by to get an integer
443
- // it's usually 1, 2, or 4 (for e.g. dpr of 2, 2.5 and 2.25 respectively)
444
- nearestMultiple(Math.floor(editor.getInstanceState().devicePixelRatio * 100) / 100),
445
- [editor]
446
- )
447
-
448
437
  return (
449
438
  <>
450
439
  {renderingShapes.map((result) => (
451
- <Shape key={result.id + '_shape'} {...result} dprMultiple={dprMultiple} />
440
+ <Shape key={result.id + '_shape'} {...result} />
452
441
  ))}
453
442
  {tlenv.isSafari && <ReflowIfNeeded />}
454
443
  </>
@@ -44,7 +44,7 @@ export function DefaultCollaboratorHint({
44
44
  href={`#${cursorHintId}`}
45
45
  color={color}
46
46
  strokeWidth={3}
47
- stroke="var(--color-background)"
47
+ stroke="var(--tl-color-background)"
48
48
  />
49
49
  <use href={`#${cursorHintId}`} color={color} opacity={opacity} />
50
50
  </svg>
@@ -75,7 +75,7 @@ export const DefaultErrorFallback: TLErrorFallbackComponent = ({ error, editor }
75
75
 
76
76
  // if we can't find a theme class from the app or from a parent, we have
77
77
  // to fall back on using a media query:
78
- if (typeof window !== 'undefined' && 'matchMedia' in window) {
78
+ if (typeof window !== 'undefined' && window.matchMedia) {
79
79
  setIsDarkMode(window.matchMedia('(prefers-color-scheme: dark)').matches)
80
80
  }
81
81
  }, [isDarkModeFromApp])
@@ -21,7 +21,7 @@ export function DefaultScribble({ scribble, zoom, color, opacity, className }: T
21
21
  <path
22
22
  className="tl-scribble"
23
23
  d={getSvgPathFromPoints(scribble.points, false)}
24
- stroke={color ?? `var(--color-${scribble.color})`}
24
+ stroke={color ?? `var(--tl-color-${scribble.color})`}
25
25
  fill="none"
26
26
  strokeWidth={8 / zoom}
27
27
  opacity={opacity ?? scribble.opacity}
@@ -87,7 +87,11 @@ export const DefaultShapeIndicator = memo(function DefaultShapeIndicator({
87
87
 
88
88
  return (
89
89
  <svg ref={rIndicator} className={classNames('tl-overlays__item', className)} aria-hidden="true">
90
- <g className="tl-shape-indicator" stroke={color ?? 'var(--color-selected)'} opacity={opacity}>
90
+ <g
91
+ className="tl-shape-indicator"
92
+ stroke={color ?? 'var(--tl-color-selected)'}
93
+ opacity={opacity}
94
+ >
91
95
  <InnerIndicator editor={editor} id={shapeId} />
92
96
  </g>
93
97
  </svg>
@@ -24,6 +24,7 @@ export interface TLUserPreferences {
24
24
  isWrapMode?: boolean | null
25
25
  isDynamicSizeMode?: boolean | null
26
26
  isPasteAtCursorMode?: boolean | null
27
+ showUiLabels?: boolean | null
27
28
  }
28
29
 
29
30
  interface UserDataSnapshot {
@@ -52,6 +53,7 @@ export const userTypeValidator: T.Validator<TLUserPreferences> = T.object<TLUser
52
53
  isWrapMode: T.boolean.nullable().optional(),
53
54
  isDynamicSizeMode: T.boolean.nullable().optional(),
54
55
  isPasteAtCursorMode: T.boolean.nullable().optional(),
56
+ showUiLabels: T.boolean.nullable().optional(),
55
57
  })
56
58
 
57
59
  const Versions = {
@@ -64,6 +66,7 @@ const Versions = {
64
66
  AllowSystemColorScheme: 7,
65
67
  AddPasteAtCursor: 8,
66
68
  AddKeyboardShortcuts: 9,
69
+ AddShowUiLabels: 10,
67
70
  } as const
68
71
 
69
72
  const CURRENT_VERSION = Math.max(...Object.values(Versions))
@@ -102,6 +105,9 @@ function migrateSnapshot(data: { version: number; user: any }) {
102
105
  if (data.version < Versions.AddKeyboardShortcuts) {
103
106
  data.user.areKeyboardShortcutsEnabled = true
104
107
  }
108
+ if (data.version < Versions.AddShowUiLabels) {
109
+ data.user.showUiLabels = false
110
+ }
105
111
 
106
112
  // finally
107
113
  data.version = CURRENT_VERSION
@@ -129,7 +135,7 @@ function getRandomColor() {
129
135
 
130
136
  /** @internal */
131
137
  export function userPrefersReducedMotion() {
132
- if (typeof window !== 'undefined' && 'matchMedia' in window) {
138
+ if (typeof window !== 'undefined' && window.matchMedia) {
133
139
  return window.matchMedia?.('(prefers-reduced-motion: reduce)')?.matches ?? false
134
140
  }
135
141
 
@@ -150,6 +156,7 @@ export const defaultUserPreferences = Object.freeze({
150
156
  isWrapMode: false,
151
157
  isDynamicSizeMode: false,
152
158
  isPasteAtCursorMode: false,
159
+ showUiLabels: false,
153
160
  colorScheme: 'light',
154
161
  }) satisfies Readonly<Omit<TLUserPreferences, 'id'>>
155
162
 
@@ -1,3 +1,4 @@
1
+ import { vi } from 'vitest'
1
2
  import {
2
3
  Box,
3
4
  Geometry2d,
@@ -59,8 +60,8 @@ beforeEach(() => {
59
60
  getContainer: () => document.body,
60
61
  })
61
62
  editor.setCameraOptions({ isLocked: true })
62
- editor.setCamera = jest.fn()
63
- editor.user.getAnimationSpeed = jest.fn()
63
+ editor.setCamera = vi.fn()
64
+ editor.user.getAnimationSpeed = vi.fn()
64
65
  })
65
66
 
66
67
  describe('centerOnPoint', () => {
@@ -94,13 +95,13 @@ describe('updateShape', () => {
94
95
 
95
96
  describe('zoomToFit', () => {
96
97
  it('no-op when isLocked is set', () => {
97
- editor.getCurrentPageShapeIds = jest.fn(() => new Set([createShapeId('box1')]))
98
+ editor.getCurrentPageShapeIds = vi.fn(() => new Set([createShapeId('box1')]))
98
99
  editor.zoomToFit()
99
100
  expect(editor.setCamera).not.toHaveBeenCalled()
100
101
  })
101
102
 
102
103
  it('sets camera when isLocked is set and force flag is set', () => {
103
- editor.getCurrentPageShapeIds = jest.fn(() => new Set([createShapeId('box1')]))
104
+ editor.getCurrentPageShapeIds = vi.fn(() => new Set([createShapeId('box1')]))
104
105
  editor.zoomToFit({ force: true })
105
106
  expect(editor.setCamera).toHaveBeenCalled()
106
107
  })
@@ -144,13 +145,13 @@ describe('zoomOut', () => {
144
145
 
145
146
  describe('zoomToSelection', () => {
146
147
  it('no-op when isLocked is set', () => {
147
- editor.getSelectionPageBounds = jest.fn(() => Box.From({ x: 0, y: 0, w: 100, h: 100 }))
148
+ editor.getSelectionPageBounds = vi.fn(() => Box.From({ x: 0, y: 0, w: 100, h: 100 }))
148
149
  editor.zoomToSelection()
149
150
  expect(editor.setCamera).not.toHaveBeenCalled()
150
151
  })
151
152
 
152
153
  it('sets camera when isLocked is set and force flag is set', () => {
153
- editor.getSelectionPageBounds = jest.fn(() => Box.From({ x: 0, y: 0, w: 100, h: 100 }))
154
+ editor.getSelectionPageBounds = vi.fn(() => Box.From({ x: 0, y: 0, w: 100, h: 100 }))
154
155
  editor.zoomToSelection({ force: true })
155
156
  expect(editor.setCamera).toHaveBeenCalled()
156
157
  })
@@ -286,7 +287,7 @@ describe('getShapesAtPoint', () => {
286
287
 
287
288
  it('filters out hidden shapes', () => {
288
289
  // Create a spy to mock isShapeHidden
289
- const isShapeHiddenSpy = jest.spyOn(editor, 'isShapeHidden')
290
+ const isShapeHiddenSpy = vi.spyOn(editor, 'isShapeHidden')
290
291
  isShapeHiddenSpy.mockImplementation((shape) => {
291
292
  return typeof shape === 'string' ? shape === ids.shape3 : shape.id === ids.shape3
292
293
  })
@@ -352,7 +353,7 @@ describe('getShapesAtPoint', () => {
352
353
 
353
354
  it('returns empty array when all shapes are hidden', () => {
354
355
  // Mock all shapes as hidden
355
- const isShapeHiddenSpy = jest.spyOn(editor, 'isShapeHidden')
356
+ const isShapeHiddenSpy = vi.spyOn(editor, 'isShapeHidden')
356
357
  isShapeHiddenSpy.mockReturnValue(true)
357
358
 
358
359
  const shapes = editor.getShapesAtPoint({ x: 50, y: 50 })
@@ -692,7 +693,7 @@ describe('selectAll', () => {
692
693
  const initialSelectedIds = editor.getSelectedShapeIds()
693
694
 
694
695
  // Spy on setSelectedShapes to verify it's not called
695
- const setSelectedShapesSpy = jest.spyOn(editor, 'setSelectedShapes')
696
+ const setSelectedShapesSpy = vi.spyOn(editor, 'setSelectedShapes')
696
697
 
697
698
  // Call selectAll
698
699
  editor.selectAll()
@@ -713,7 +714,7 @@ describe('selectAll', () => {
713
714
  const initialSelectedIds = editor.getSelectedShapeIds()
714
715
 
715
716
  // Spy on setSelectedShapes to verify it's not called
716
- const setSelectedShapesSpy = jest.spyOn(editor, 'setSelectedShapes')
717
+ const setSelectedShapesSpy = vi.spyOn(editor, 'setSelectedShapes')
717
718
 
718
719
  // Call selectAll
719
720
  editor.selectAll()
@@ -818,7 +819,7 @@ describe('selectAll', () => {
818
819
  const initialSelectedIds = Array.from(editor.getSelectedShapeIds())
819
820
 
820
821
  // Spy on setSelectedShapes to verify it's not called
821
- const setSelectedShapesSpy = jest.spyOn(editor, 'setSelectedShapes')
822
+ const setSelectedShapesSpy = vi.spyOn(editor, 'setSelectedShapes')
822
823
 
823
824
  // Call selectAll
824
825
  editor.selectAll()
@@ -832,3 +833,93 @@ describe('selectAll', () => {
832
833
  setSelectedShapesSpy.mockRestore()
833
834
  })
834
835
  })
836
+
837
+ describe('putExternalContent', () => {
838
+ let mockHandler: any
839
+
840
+ beforeEach(() => {
841
+ mockHandler = vi.fn()
842
+ editor.registerExternalContentHandler('text', mockHandler)
843
+ })
844
+
845
+ it('calls external content handler when not readonly', async () => {
846
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(false)
847
+
848
+ const info = { type: 'text' as const, text: 'test-data' }
849
+ await editor.putExternalContent(info)
850
+
851
+ expect(mockHandler).toHaveBeenCalledWith(info)
852
+ })
853
+
854
+ it('does not call external content handler when readonly', async () => {
855
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(true)
856
+
857
+ const info = { type: 'text' as const, text: 'test-data' }
858
+ await editor.putExternalContent(info)
859
+
860
+ expect(mockHandler).not.toHaveBeenCalled()
861
+ })
862
+
863
+ it('calls external content handler when readonly but force is true', async () => {
864
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(true)
865
+
866
+ const info = { type: 'text' as const, text: 'test-data' }
867
+ await editor.putExternalContent(info, { force: true })
868
+
869
+ expect(mockHandler).toHaveBeenCalledWith(info)
870
+ })
871
+
872
+ it('calls external content handler when force is false and not readonly', async () => {
873
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(false)
874
+
875
+ const info = { type: 'text' as const, text: 'test-data' }
876
+ await editor.putExternalContent(info, { force: false })
877
+
878
+ expect(mockHandler).toHaveBeenCalledWith(info)
879
+ })
880
+ })
881
+
882
+ describe('replaceExternalContent', () => {
883
+ let mockHandler: any
884
+
885
+ beforeEach(() => {
886
+ mockHandler = vi.fn()
887
+ editor.registerExternalContentHandler('text', mockHandler)
888
+ })
889
+
890
+ it('calls external content handler when not readonly', async () => {
891
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(false)
892
+
893
+ const info = { type: 'text' as const, text: 'test-data' }
894
+ await editor.replaceExternalContent(info)
895
+
896
+ expect(mockHandler).toHaveBeenCalledWith(info)
897
+ })
898
+
899
+ it('does not call external content handler when readonly', async () => {
900
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(true)
901
+
902
+ const info = { type: 'text' as const, text: 'test-data' }
903
+ await editor.replaceExternalContent(info)
904
+
905
+ expect(mockHandler).not.toHaveBeenCalled()
906
+ })
907
+
908
+ it('calls external content handler when readonly but force is true', async () => {
909
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(true)
910
+
911
+ const info = { type: 'text' as const, text: 'test-data' }
912
+ await editor.replaceExternalContent(info, { force: true })
913
+
914
+ expect(mockHandler).toHaveBeenCalledWith(info)
915
+ })
916
+
917
+ it('calls external content handler when force is false and not readonly', async () => {
918
+ vi.spyOn(editor, 'getIsReadonly').mockReturnValue(false)
919
+
920
+ const info = { type: 'text' as const, text: 'test-data' }
921
+ await editor.replaceExternalContent(info, { force: false })
922
+
923
+ expect(mockHandler).toHaveBeenCalledWith(info)
924
+ })
925
+ })