js-draw 0.18.2 → 0.19.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 (227) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/bundle.js +2 -2
  3. package/dist/bundledStyles.js +1 -0
  4. package/dist/cjs/src/Color4.d.ts +8 -0
  5. package/dist/cjs/src/Color4.js +67 -0
  6. package/dist/cjs/src/Editor.d.ts +2 -2
  7. package/dist/cjs/src/Editor.js +2 -2
  8. package/dist/cjs/src/SVGLoader.js +8 -5
  9. package/dist/cjs/src/components/AbstractComponent.d.ts +2 -2
  10. package/dist/cjs/src/components/AbstractComponent.js +3 -3
  11. package/dist/cjs/src/components/ImageBackground.js +1 -1
  12. package/dist/cjs/src/components/RestylableComponent.d.ts +21 -2
  13. package/dist/cjs/src/components/Stroke.d.ts +35 -0
  14. package/dist/cjs/src/components/Stroke.js +36 -2
  15. package/dist/cjs/src/components/TextComponent.d.ts +26 -4
  16. package/dist/cjs/src/components/TextComponent.js +22 -0
  17. package/dist/cjs/src/components/lib.d.ts +3 -2
  18. package/dist/cjs/src/lib.d.ts +30 -0
  19. package/dist/cjs/src/lib.js +30 -0
  20. package/dist/cjs/src/rendering/RenderingStyle.d.ts +4 -4
  21. package/dist/cjs/src/rendering/TextRenderingStyle.d.ts +10 -10
  22. package/dist/cjs/src/rendering/lib.d.ts +2 -0
  23. package/dist/cjs/src/rendering/renderers/AbstractRenderer.d.ts +2 -2
  24. package/dist/cjs/src/rendering/renderers/CanvasRenderer.d.ts +2 -2
  25. package/dist/cjs/src/rendering/renderers/DummyRenderer.d.ts +2 -2
  26. package/dist/cjs/src/rendering/renderers/SVGRenderer.d.ts +2 -2
  27. package/dist/cjs/src/rendering/renderers/TextOnlyRenderer.d.ts +2 -2
  28. package/dist/cjs/src/toolbar/IconProvider.d.ts +2 -2
  29. package/dist/cjs/src/toolbar/localization.js +1 -1
  30. package/dist/cjs/src/toolbar/widgets/BaseWidget.js +1 -1
  31. package/dist/cjs/src/tools/SoundUITool.d.ts +24 -0
  32. package/dist/cjs/src/tools/SoundUITool.js +164 -0
  33. package/dist/cjs/src/tools/TextTool.d.ts +2 -2
  34. package/dist/cjs/src/tools/ToolController.js +6 -1
  35. package/dist/cjs/src/tools/lib.d.ts +1 -0
  36. package/dist/cjs/src/tools/lib.js +3 -1
  37. package/dist/cjs/src/tools/localization.d.ts +3 -0
  38. package/dist/cjs/src/tools/localization.js +3 -0
  39. package/dist/mjs/src/Color4.d.ts +8 -0
  40. package/dist/mjs/src/Color4.mjs +64 -0
  41. package/dist/mjs/src/Editor.d.ts +2 -2
  42. package/dist/mjs/src/Editor.mjs +2 -2
  43. package/dist/mjs/src/SVGLoader.mjs +8 -5
  44. package/dist/mjs/src/components/AbstractComponent.d.ts +2 -2
  45. package/dist/mjs/src/components/AbstractComponent.mjs +3 -3
  46. package/dist/mjs/src/components/ImageBackground.mjs +1 -1
  47. package/dist/mjs/src/components/RestylableComponent.d.ts +21 -2
  48. package/dist/mjs/src/components/Stroke.d.ts +35 -0
  49. package/dist/mjs/src/components/Stroke.mjs +36 -2
  50. package/dist/mjs/src/components/TextComponent.d.ts +26 -4
  51. package/dist/mjs/src/components/TextComponent.mjs +22 -0
  52. package/dist/mjs/src/components/lib.d.ts +3 -2
  53. package/dist/mjs/src/lib.d.ts +30 -0
  54. package/dist/mjs/src/lib.mjs +30 -0
  55. package/dist/mjs/src/rendering/RenderingStyle.d.ts +4 -4
  56. package/dist/mjs/src/rendering/TextRenderingStyle.d.ts +10 -10
  57. package/dist/mjs/src/rendering/lib.d.ts +2 -0
  58. package/dist/mjs/src/rendering/renderers/AbstractRenderer.d.ts +2 -2
  59. package/dist/mjs/src/rendering/renderers/CanvasRenderer.d.ts +2 -2
  60. package/dist/mjs/src/rendering/renderers/DummyRenderer.d.ts +2 -2
  61. package/dist/mjs/src/rendering/renderers/SVGRenderer.d.ts +2 -2
  62. package/dist/mjs/src/rendering/renderers/TextOnlyRenderer.d.ts +2 -2
  63. package/dist/mjs/src/toolbar/IconProvider.d.ts +2 -2
  64. package/dist/mjs/src/toolbar/localization.mjs +1 -1
  65. package/dist/mjs/src/toolbar/widgets/BaseWidget.mjs +1 -1
  66. package/dist/mjs/src/tools/SoundUITool.d.ts +24 -0
  67. package/dist/mjs/src/tools/SoundUITool.mjs +158 -0
  68. package/dist/mjs/src/tools/TextTool.d.ts +2 -2
  69. package/dist/mjs/src/tools/ToolController.mjs +6 -1
  70. package/dist/mjs/src/tools/lib.d.ts +1 -0
  71. package/dist/mjs/src/tools/lib.mjs +1 -0
  72. package/dist/mjs/src/tools/localization.d.ts +3 -0
  73. package/dist/mjs/src/tools/localization.mjs +3 -0
  74. package/package.json +6 -4
  75. package/src/Editor.css +2 -2
  76. package/src/tools/SoundUITool.css +15 -0
  77. package/src/tools/tools.css +4 -0
  78. package/src/Color4.test.ts +0 -40
  79. package/src/Color4.ts +0 -236
  80. package/src/Editor.loadFrom.test.ts +0 -24
  81. package/src/Editor.toSVG.test.ts +0 -111
  82. package/src/Editor.ts +0 -1122
  83. package/src/EditorImage.test.ts +0 -120
  84. package/src/EditorImage.ts +0 -603
  85. package/src/EventDispatcher.test.ts +0 -123
  86. package/src/EventDispatcher.ts +0 -71
  87. package/src/Pointer.ts +0 -127
  88. package/src/SVGLoader.test.ts +0 -114
  89. package/src/SVGLoader.ts +0 -511
  90. package/src/UndoRedoHistory.test.ts +0 -33
  91. package/src/UndoRedoHistory.ts +0 -102
  92. package/src/Viewport.ts +0 -319
  93. package/src/bundle/bundled.ts +0 -7
  94. package/src/commands/Command.ts +0 -45
  95. package/src/commands/Duplicate.ts +0 -48
  96. package/src/commands/Erase.ts +0 -74
  97. package/src/commands/SerializableCommand.ts +0 -49
  98. package/src/commands/UnresolvedCommand.ts +0 -37
  99. package/src/commands/invertCommand.ts +0 -51
  100. package/src/commands/lib.ts +0 -16
  101. package/src/commands/localization.ts +0 -47
  102. package/src/commands/uniteCommands.test.ts +0 -23
  103. package/src/commands/uniteCommands.ts +0 -135
  104. package/src/components/AbstractComponent.transformBy.test.ts +0 -22
  105. package/src/components/AbstractComponent.ts +0 -364
  106. package/src/components/ImageBackground.test.ts +0 -35
  107. package/src/components/ImageBackground.ts +0 -176
  108. package/src/components/ImageComponent.ts +0 -171
  109. package/src/components/RestylableComponent.ts +0 -142
  110. package/src/components/SVGGlobalAttributesObject.ts +0 -81
  111. package/src/components/Stroke.test.ts +0 -139
  112. package/src/components/Stroke.ts +0 -245
  113. package/src/components/TextComponent.test.ts +0 -99
  114. package/src/components/TextComponent.ts +0 -315
  115. package/src/components/UnknownSVGObject.test.ts +0 -10
  116. package/src/components/UnknownSVGObject.ts +0 -60
  117. package/src/components/builders/ArrowBuilder.ts +0 -107
  118. package/src/components/builders/FreehandLineBuilder.ts +0 -212
  119. package/src/components/builders/LineBuilder.ts +0 -77
  120. package/src/components/builders/PressureSensitiveFreehandLineBuilder.ts +0 -454
  121. package/src/components/builders/RectangleBuilder.ts +0 -74
  122. package/src/components/builders/types.ts +0 -15
  123. package/src/components/lib.ts +0 -25
  124. package/src/components/localization.ts +0 -22
  125. package/src/components/util/StrokeSmoother.ts +0 -293
  126. package/src/components/util/describeComponentList.ts +0 -18
  127. package/src/lib.ts +0 -37
  128. package/src/localization.ts +0 -34
  129. package/src/localizations/de.ts +0 -98
  130. package/src/localizations/en.ts +0 -8
  131. package/src/localizations/es.ts +0 -74
  132. package/src/localizations/getLocalizationTable.test.ts +0 -27
  133. package/src/localizations/getLocalizationTable.ts +0 -55
  134. package/src/math/LineSegment2.test.ts +0 -99
  135. package/src/math/LineSegment2.ts +0 -160
  136. package/src/math/Mat33.test.ts +0 -244
  137. package/src/math/Mat33.ts +0 -437
  138. package/src/math/Path.fromString.test.ts +0 -223
  139. package/src/math/Path.test.ts +0 -198
  140. package/src/math/Path.toString.test.ts +0 -77
  141. package/src/math/Path.ts +0 -790
  142. package/src/math/Rect2.test.ts +0 -204
  143. package/src/math/Rect2.ts +0 -315
  144. package/src/math/Triangle.ts +0 -29
  145. package/src/math/Vec2.test.ts +0 -30
  146. package/src/math/Vec2.ts +0 -18
  147. package/src/math/Vec3.test.ts +0 -44
  148. package/src/math/Vec3.ts +0 -218
  149. package/src/math/lib.ts +0 -15
  150. package/src/math/rounding.test.ts +0 -65
  151. package/src/math/rounding.ts +0 -156
  152. package/src/rendering/Display.ts +0 -249
  153. package/src/rendering/RenderingStyle.test.ts +0 -68
  154. package/src/rendering/RenderingStyle.ts +0 -55
  155. package/src/rendering/TextRenderingStyle.ts +0 -45
  156. package/src/rendering/caching/CacheRecord.test.ts +0 -49
  157. package/src/rendering/caching/CacheRecord.ts +0 -77
  158. package/src/rendering/caching/CacheRecordManager.ts +0 -71
  159. package/src/rendering/caching/RenderingCache.test.ts +0 -44
  160. package/src/rendering/caching/RenderingCache.ts +0 -66
  161. package/src/rendering/caching/RenderingCacheNode.ts +0 -405
  162. package/src/rendering/caching/testUtils.ts +0 -35
  163. package/src/rendering/caching/types.ts +0 -34
  164. package/src/rendering/lib.ts +0 -6
  165. package/src/rendering/localization.ts +0 -20
  166. package/src/rendering/renderers/AbstractRenderer.ts +0 -222
  167. package/src/rendering/renderers/CanvasRenderer.ts +0 -296
  168. package/src/rendering/renderers/DummyRenderer.test.ts +0 -42
  169. package/src/rendering/renderers/DummyRenderer.ts +0 -136
  170. package/src/rendering/renderers/SVGRenderer.ts +0 -354
  171. package/src/rendering/renderers/TextOnlyRenderer.ts +0 -70
  172. package/src/testing/beforeEachFile.ts +0 -8
  173. package/src/testing/createEditor.ts +0 -11
  174. package/src/testing/global.d.ts +0 -17
  175. package/src/testing/lib.ts +0 -3
  176. package/src/testing/loadExpectExtensions.ts +0 -25
  177. package/src/testing/sendPenEvent.ts +0 -31
  178. package/src/testing/sendTouchEvent.ts +0 -78
  179. package/src/toolbar/HTMLToolbar.ts +0 -492
  180. package/src/toolbar/IconProvider.ts +0 -736
  181. package/src/toolbar/lib.ts +0 -4
  182. package/src/toolbar/localization.ts +0 -106
  183. package/src/toolbar/makeColorInput.ts +0 -145
  184. package/src/toolbar/types.ts +0 -5
  185. package/src/toolbar/widgets/ActionButtonWidget.ts +0 -39
  186. package/src/toolbar/widgets/BaseToolWidget.ts +0 -56
  187. package/src/toolbar/widgets/BaseWidget.ts +0 -377
  188. package/src/toolbar/widgets/DocumentPropertiesWidget.ts +0 -167
  189. package/src/toolbar/widgets/EraserToolWidget.ts +0 -85
  190. package/src/toolbar/widgets/HandToolWidget.ts +0 -250
  191. package/src/toolbar/widgets/InsertImageWidget.ts +0 -223
  192. package/src/toolbar/widgets/OverflowWidget.ts +0 -92
  193. package/src/toolbar/widgets/PenToolWidget.ts +0 -288
  194. package/src/toolbar/widgets/SelectionToolWidget.ts +0 -190
  195. package/src/toolbar/widgets/TextToolWidget.ts +0 -145
  196. package/src/toolbar/widgets/lib.ts +0 -13
  197. package/src/tools/BaseTool.ts +0 -76
  198. package/src/tools/Eraser.test.ts +0 -103
  199. package/src/tools/Eraser.ts +0 -139
  200. package/src/tools/FindTool.ts +0 -152
  201. package/src/tools/PanZoom.test.ts +0 -310
  202. package/src/tools/PanZoom.ts +0 -520
  203. package/src/tools/PasteHandler.ts +0 -95
  204. package/src/tools/Pen.test.ts +0 -194
  205. package/src/tools/Pen.ts +0 -226
  206. package/src/tools/PipetteTool.ts +0 -55
  207. package/src/tools/SelectionTool/SelectAllShortcutHandler.ts +0 -28
  208. package/src/tools/SelectionTool/Selection.ts +0 -607
  209. package/src/tools/SelectionTool/SelectionHandle.ts +0 -108
  210. package/src/tools/SelectionTool/SelectionTool.test.ts +0 -261
  211. package/src/tools/SelectionTool/SelectionTool.ts +0 -480
  212. package/src/tools/SelectionTool/TransformMode.ts +0 -114
  213. package/src/tools/SelectionTool/types.ts +0 -11
  214. package/src/tools/TextTool.ts +0 -326
  215. package/src/tools/ToolController.ts +0 -178
  216. package/src/tools/ToolEnabledGroup.ts +0 -14
  217. package/src/tools/ToolSwitcherShortcut.ts +0 -39
  218. package/src/tools/ToolbarShortcutHandler.ts +0 -34
  219. package/src/tools/UndoRedoShortcut.test.ts +0 -56
  220. package/src/tools/UndoRedoShortcut.ts +0 -25
  221. package/src/tools/lib.ts +0 -21
  222. package/src/tools/localization.ts +0 -66
  223. package/src/types.ts +0 -234
  224. package/src/util/assertions.ts +0 -55
  225. package/src/util/fileToBase64.ts +0 -18
  226. package/src/util/untilNextAnimationFrame.ts +0 -9
  227. package/src/util/waitForTimeout.ts +0 -9
package/src/math/Vec3.ts DELETED
@@ -1,218 +0,0 @@
1
-
2
-
3
- /**
4
- * A vector with three components. Can also be used to represent a two-component vector.
5
- *
6
- * A `Vec3` is immutable.
7
- */
8
- export default class Vec3 {
9
- private constructor(
10
- public readonly x: number,
11
- public readonly y: number,
12
- public readonly z: number
13
- ) {
14
- }
15
-
16
- /** Returns the x, y components of this. */
17
- public get xy(): { x: number; y: number } {
18
- // Useful for APIs that behave differently if .z is present.
19
- return {
20
- x: this.x,
21
- y: this.y,
22
- };
23
- }
24
-
25
- public static of(x: number, y: number, z: number): Vec3 {
26
- return new Vec3(x, y, z);
27
- }
28
-
29
- /** Returns this' `idx`th component. For example, `Vec3.of(1, 2, 3).at(1) → 2`. */
30
- public at(idx: number): number {
31
- if (idx === 0) return this.x;
32
- if (idx === 1) return this.y;
33
- if (idx === 2) return this.z;
34
-
35
- throw new Error(`${idx} out of bounds!`);
36
- }
37
-
38
- /** Alias for this.magnitude. */
39
- public length(): number {
40
- return this.magnitude();
41
- }
42
-
43
- public magnitude(): number {
44
- return Math.sqrt(this.dot(this));
45
- }
46
-
47
- public magnitudeSquared(): number {
48
- return this.dot(this);
49
- }
50
-
51
- /**
52
- * Return this' angle in the XY plane (treats this as a Vec2).
53
- *
54
- * This is equivalent to `Math.atan2(vec.y, vec.x)`.
55
- */
56
- public angle(): number {
57
- return Math.atan2(this.y, this.x);
58
- }
59
-
60
- /**
61
- * Returns a unit vector in the same direction as this.
62
- *
63
- * If `this` has zero length, the resultant vector has `NaN` components.
64
- */
65
- public normalized(): Vec3 {
66
- const norm = this.magnitude();
67
- return Vec3.of(this.x / norm, this.y / norm, this.z / norm);
68
- }
69
-
70
- /** @returns A copy of `this` multiplied by a scalar. */
71
- public times(c: number): Vec3 {
72
- return Vec3.of(this.x * c, this.y * c, this.z * c);
73
- }
74
-
75
- public plus(v: Vec3): Vec3 {
76
- return Vec3.of(this.x + v.x, this.y + v.y, this.z + v.z);
77
- }
78
-
79
- public minus(v: Vec3): Vec3 {
80
- return Vec3.of(this.x - v.x, this.y - v.y, this.z - v.z);
81
- }
82
-
83
- public dot(other: Vec3): number {
84
- return this.x * other.x + this.y * other.y + this.z * other.z;
85
- }
86
-
87
- public cross(other: Vec3): Vec3 {
88
- // | i j k |
89
- // | x1 y1 z1| = (i)(y1z2 - y2z1) - (j)(x1z2 - x2z1) + (k)(x1y2 - x2y1)
90
- // | x2 y2 z2|
91
- return Vec3.of(
92
- this.y * other.z - other.y * this.z,
93
- other.x * this.z - this.x * other.z,
94
- this.x * other.y - other.x * this.y
95
- );
96
- }
97
-
98
- /**
99
- * If `other` is a `Vec3`, multiplies `this` component-wise by `other`. Otherwise,
100
- * if `other is a `number`, returns the result of scalar multiplication.
101
- *
102
- * @example
103
- * ```
104
- * Vec3.of(1, 2, 3).scale(Vec3.of(2, 4, 6)); // → Vec3(2, 8, 18)
105
- * ```
106
- */
107
- public scale(other: Vec3|number): Vec3 {
108
- if (typeof other === 'number') {
109
- return this.times(other);
110
- }
111
-
112
- return Vec3.of(
113
- this.x * other.x,
114
- this.y * other.y,
115
- this.z * other.z,
116
- );
117
- }
118
-
119
- /**
120
- * Returns a vector orthogonal to this. If this is a Vec2, returns `this` rotated
121
- * 90 degrees counter-clockwise.
122
- */
123
- public orthog(): Vec3 {
124
- // If parallel to the z-axis
125
- if (this.dot(Vec3.unitX) === 0 && this.dot(Vec3.unitY) === 0) {
126
- return this.dot(Vec3.unitX) === 0 ? Vec3.unitX : this.cross(Vec3.unitX).normalized();
127
- }
128
-
129
- return this.cross(Vec3.unitZ.times(-1)).normalized();
130
- }
131
-
132
- /** Returns this plus a vector of length `distance` in `direction`. */
133
- public extend(distance: number, direction: Vec3): Vec3 {
134
- return this.plus(direction.normalized().times(distance));
135
- }
136
-
137
- /** Returns a vector `fractionTo` of the way to target from this. */
138
- public lerp(target: Vec3, fractionTo: number): Vec3 {
139
- return this.times(1 - fractionTo).plus(target.times(fractionTo));
140
- }
141
-
142
- /**
143
- * `zip` Maps a component of this and a corresponding component of
144
- * `other` to a component of the output vector.
145
- *
146
- * @example
147
- * ```
148
- * const a = Vec3.of(1, 2, 3);
149
- * const b = Vec3.of(0.5, 2.1, 2.9);
150
- *
151
- * const zipped = a.zip(b, (aComponent, bComponent) => {
152
- * return Math.min(aComponent, bComponent);
153
- * });
154
- *
155
- * console.log(zipped.toString()); // → Vec(0.5, 2, 2.9)
156
- * ```
157
- */
158
- public zip(
159
- other: Vec3, zip: (componentInThis: number, componentInOther: number)=> number
160
- ): Vec3 {
161
- return Vec3.of(
162
- zip(other.x, this.x),
163
- zip(other.y, this.y),
164
- zip(other.z, this.z)
165
- );
166
- }
167
-
168
- /**
169
- * Returns a vector with each component acted on by `fn`.
170
- *
171
- * @example
172
- * ```
173
- * console.log(Vec3.of(1, 2, 3).map(val => val + 1)); // → Vec(2, 3, 4)
174
- * ```
175
- */
176
- public map(fn: (component: number, index: number)=> number): Vec3 {
177
- return Vec3.of(
178
- fn(this.x, 0), fn(this.y, 1), fn(this.z, 2)
179
- );
180
- }
181
-
182
- public asArray(): [ number, number, number ] {
183
- return [this.x, this.y, this.z];
184
- }
185
-
186
- /**
187
- * [fuzz] The maximum difference between two components for this and [other]
188
- * to be considered equal.
189
- *
190
- * @example
191
- * ```
192
- * Vec3.of(1, 2, 3).eq(Vec3.of(4, 5, 6), 100); // → true
193
- * Vec3.of(1, 2, 3).eq(Vec3.of(4, 5, 6), 0.1); // → false
194
- * Vec3.of(1, 2, 3).eq(Vec3.of(4, 5, 6), 3); // → true
195
- * Vec3.of(1, 2, 3).eq(Vec3.of(4, 5, 6), 3.01); // → true
196
- * Vec3.of(1, 2, 3).eq(Vec3.of(4, 5, 6), 2.99); // → false
197
- * ```
198
- */
199
- public eq(other: Vec3, fuzz: number = 1e-10): boolean {
200
- for (let i = 0; i < 3; i++) {
201
- if (Math.abs(other.at(i) - this.at(i)) > fuzz) {
202
- return false;
203
- }
204
- }
205
-
206
- return true;
207
- }
208
-
209
- public toString(): string {
210
- return `Vec(${this.x}, ${this.y}, ${this.z})`;
211
- }
212
-
213
-
214
- public static unitX = Vec3.of(1, 0, 0);
215
- public static unitY = Vec3.of(0, 1, 0);
216
- public static unitZ = Vec3.of(0, 0, 1);
217
- public static zero = Vec3.of(0, 0, 0);
218
- }
package/src/math/lib.ts DELETED
@@ -1,15 +0,0 @@
1
- import LineSegment2 from './LineSegment2';
2
- import Mat33 from './Mat33';
3
- import Path from './Path';
4
- import Rect2 from './Rect2';
5
- import { Vec2 } from './Vec2';
6
- import Vec3 from './Vec3';
7
-
8
- export {
9
- LineSegment2,
10
- Mat33,
11
- Path,
12
- Rect2,
13
- Vec3,
14
- Vec2,
15
- };
@@ -1,65 +0,0 @@
1
- import { cleanUpNumber, toRoundedString, toStringOfSamePrecision } from './rounding';
2
-
3
- describe('toRoundedString', () => {
4
- it('should round up numbers endings similar to .999999999999999', () => {
5
- expect(toRoundedString(0.999999999)).toBe('1');
6
- expect(toRoundedString(0.899999999)).toBe('.9');
7
- expect(toRoundedString(9.999999999)).toBe('10');
8
- expect(toRoundedString(-10.999999999)).toBe('-11');
9
- });
10
-
11
- it('should round up numbers similar to 10.999999998', () => {
12
- expect(toRoundedString(10.999999998)).toBe('11');
13
- });
14
-
15
- it('should round strings with multiple digits after the ending decimal points', () => {
16
- expect(toRoundedString(292.2 - 292.8)).toBe('-.6');
17
- expect(toRoundedString(4.06425600000023)).toBe('4.064256');
18
- });
19
-
20
- it('should round down strings ending endings similar to .00000001', () => {
21
- expect(toRoundedString(10.00000001)).toBe('10');
22
- expect(toRoundedString(-30.00000001)).toBe('-30');
23
- expect(toRoundedString(-14.20000000000002)).toBe('-14.2');
24
- });
25
-
26
- it('should not round numbers insufficiently close to the next', () => {
27
- expect(toRoundedString(-10.9999)).toBe('-10.9999');
28
- expect(toRoundedString(-10.0001)).toBe('-10.0001');
29
- expect(toRoundedString(-10.123499)).toBe('-10.123499');
30
- expect(toRoundedString(0.00123499)).toBe('.00123499');
31
- });
32
- });
33
-
34
- it('toStringOfSamePrecision', () => {
35
- expect(toStringOfSamePrecision(1.23456, '1.12')).toBe('1.23');
36
- expect(toStringOfSamePrecision(1.23456, '1.120')).toBe('1.235');
37
- expect(toStringOfSamePrecision(1.23456, '1.1')).toBe('1.2');
38
- expect(toStringOfSamePrecision(1.23456, '1.1', '5.32')).toBe('1.23');
39
- expect(toStringOfSamePrecision(-1.23456, '1.1', '5.32')).toBe('-1.23');
40
- expect(toStringOfSamePrecision(-1.99999, '1.1', '5.32')).toBe('-2');
41
- expect(toStringOfSamePrecision(1.99999, '1.1', '5.32')).toBe('2');
42
- expect(toStringOfSamePrecision(1.89999, '1.1', '5.32')).toBe('1.9');
43
- expect(toStringOfSamePrecision(9.99999999, '-1.1234')).toBe('10');
44
- expect(toStringOfSamePrecision(9.999999998999996, '100')).toBe('10');
45
- expect(toStringOfSamePrecision(0.000012345, '0.000012')).toBe('.000012');
46
- expect(toStringOfSamePrecision(0.000012645, '.000012')).toBe('.000013');
47
- expect(toStringOfSamePrecision(-0.09999999999999432, '291.3')).toBe('-.1');
48
- expect(toStringOfSamePrecision(-0.9999999999999432, '291.3')).toBe('-1');
49
- expect(toStringOfSamePrecision(9998.9, '.1', '-11')).toBe('9998.9');
50
- expect(toStringOfSamePrecision(-14.20000000000002, '.000001', '-11')).toBe('-14.2');
51
- });
52
-
53
- it('cleanUpNumber', () => {
54
- expect(cleanUpNumber('000.0000')).toBe('0');
55
- expect(cleanUpNumber('-000.0000')).toBe('0');
56
- expect(cleanUpNumber('0.0000')).toBe('0');
57
- expect(cleanUpNumber('0.001')).toBe('.001');
58
- expect(cleanUpNumber('-0.001')).toBe('-.001');
59
- expect(cleanUpNumber('-0.000000001')).toBe('-.000000001');
60
- expect(cleanUpNumber('-0.00000000100')).toBe('-.000000001');
61
- expect(cleanUpNumber('1234')).toBe('1234');
62
- expect(cleanUpNumber('1234.5')).toBe('1234.5');
63
- expect(cleanUpNumber('1234.500')).toBe('1234.5');
64
- expect(cleanUpNumber('1.1368683772161603e-13')).toBe('0');
65
- });
@@ -1,156 +0,0 @@
1
- // @packageDocumentation @internal
2
-
3
- // Clean up stringified numbers
4
- export const cleanUpNumber = (text: string) => {
5
- // Regular expression substitions can be somewhat expensive. Only do them
6
- // if necessary.
7
-
8
- if (text.indexOf('e') > 0) {
9
- // Round to zero.
10
- if (text.match(/[eE][-]\d{2,}$/)) {
11
- return '0';
12
- }
13
- }
14
-
15
- const lastChar = text.charAt(text.length - 1);
16
- if (lastChar === '0' || lastChar === '.') {
17
- // Remove trailing zeroes
18
- text = text.replace(/([.]\d*[^0]+)0+$/, '$1');
19
- text = text.replace(/[.]0+$/, '.');
20
-
21
- // Remove trailing period
22
- text = text.replace(/[.]$/, '');
23
- }
24
-
25
- const firstChar = text.charAt(0);
26
- if (firstChar === '0' || firstChar === '-') {
27
- // Remove unnecessary leading zeroes.
28
- text = text.replace(/^(0+)[.]/, '.');
29
- text = text.replace(/^-(0+)[.]/, '-.');
30
- text = text.replace(/^(-?)0+$/, '$10');
31
- }
32
-
33
- if (text === '-0') {
34
- return '0';
35
- }
36
-
37
- return text;
38
- };
39
-
40
- export const toRoundedString = (num: number): string => {
41
- // Try to remove rounding errors. If the number ends in at least three/four zeroes
42
- // (or nines) just one or two digits, it's probably a rounding error.
43
- const fixRoundingUpExp = /^([-]?\d*\.\d{3,})0{4,}\d{1,4}$/;
44
- const hasRoundingDownExp = /^([-]?)(\d*)\.(\d{3,}9{4,})\d{1,4}$/;
45
-
46
- let text = num.toString(10);
47
- if (text.indexOf('.') === -1) {
48
- return text;
49
- }
50
-
51
- const roundingDownMatch = hasRoundingDownExp.exec(text);
52
- if (roundingDownMatch) {
53
- const negativeSign = roundingDownMatch[1];
54
- const postDecimalString = roundingDownMatch[3];
55
- const lastDigit = parseInt(postDecimalString.charAt(postDecimalString.length - 1), 10);
56
- const postDecimal = parseInt(postDecimalString, 10);
57
- const preDecimal = parseInt(roundingDownMatch[2], 10);
58
-
59
- const origPostDecimalString = roundingDownMatch[3];
60
-
61
- let newPostDecimal = (postDecimal + 10 - lastDigit).toString();
62
- let carry = 0;
63
- if (newPostDecimal.length > postDecimal.toString().length) {
64
- // Left-shift
65
- newPostDecimal = newPostDecimal.substring(1);
66
- carry = 1;
67
- }
68
-
69
- // parseInt(...).toString() removes leading zeroes. Add them back.
70
- while (newPostDecimal.length < origPostDecimalString.length) {
71
- newPostDecimal = carry.toString(10) + newPostDecimal;
72
- carry = 0;
73
- }
74
-
75
- text = `${negativeSign + (preDecimal + carry).toString()}.${newPostDecimal}`;
76
- }
77
-
78
- text = text.replace(fixRoundingUpExp, '$1');
79
-
80
- return cleanUpNumber(text);
81
- };
82
-
83
- const numberExp = /^([-]?)(\d*)[.](\d+)$/;
84
- export const getLenAfterDecimal = (numberAsString: string) => {
85
- const numberMatch = numberExp.exec(numberAsString);
86
- if (!numberMatch) {
87
- // If not a match, either the number is exponential notation (or is something
88
- // like NaN or Infinity)
89
- if (numberAsString.search(/[eE]/) !== -1 || /^[a-zA-Z]+$/.exec(numberAsString)) {
90
- return -1;
91
- // Or it has no decimal point
92
- } else {
93
- return 0;
94
- }
95
- }
96
-
97
- const afterDecimalLen = numberMatch[3].length;
98
- return afterDecimalLen;
99
- };
100
-
101
- // [reference] should be a string representation of a base-10 number (no exponential (e.g. 10e10))
102
- export const toStringOfSamePrecision = (num: number, ...references: string[]): string => {
103
- const text = num.toString(10);
104
- const textMatch = numberExp.exec(text);
105
- if (!textMatch) {
106
- return text;
107
- }
108
-
109
- let decimalPlaces = -1;
110
- for (const reference of references) {
111
- decimalPlaces = Math.max(getLenAfterDecimal(reference), decimalPlaces);
112
- }
113
-
114
- if (decimalPlaces === -1) {
115
- return toRoundedString(num);
116
- }
117
-
118
- // Make text's after decimal length match [afterDecimalLen].
119
- let postDecimal = textMatch[3].substring(0, decimalPlaces);
120
- let preDecimal = textMatch[2];
121
- const nextDigit = textMatch[3].charAt(decimalPlaces);
122
-
123
- if (nextDigit !== '') {
124
- const asNumber = parseInt(nextDigit, 10);
125
- if (asNumber >= 5) {
126
- // Don't attempt to parseInt() an empty string.
127
- if (postDecimal.length > 0) {
128
- const leadingZeroMatch = /^(0+)(\d*)$/.exec(postDecimal);
129
-
130
- let leadingZeroes = '';
131
- let postLeading = postDecimal;
132
- if (leadingZeroMatch) {
133
- leadingZeroes = leadingZeroMatch[1];
134
- postLeading = leadingZeroMatch[2];
135
- }
136
-
137
- postDecimal = (parseInt(postDecimal) + 1).toString();
138
-
139
- // If postDecimal got longer, remove leading zeroes if possible
140
- if (postDecimal.length > postLeading.length && leadingZeroes.length > 0) {
141
- leadingZeroes = leadingZeroes.substring(1);
142
- }
143
-
144
- postDecimal = leadingZeroes + postDecimal;
145
- }
146
-
147
- if (postDecimal.length === 0 || postDecimal.length > decimalPlaces) {
148
- preDecimal = (parseInt(preDecimal) + 1).toString();
149
- postDecimal = postDecimal.substring(1);
150
- }
151
- }
152
- }
153
-
154
- const negativeSign = textMatch[1];
155
- return cleanUpNumber(`${negativeSign}${preDecimal}.${postDecimal}`);
156
- };
@@ -1,249 +0,0 @@
1
- import AbstractRenderer from './renderers/AbstractRenderer';
2
- import CanvasRenderer from './renderers/CanvasRenderer';
3
- import { Editor } from '../Editor';
4
- import { EditorEventType } from '../types';
5
- import DummyRenderer from './renderers/DummyRenderer';
6
- import { Point2, Vec2 } from '../math/Vec2';
7
- import RenderingCache from './caching/RenderingCache';
8
- import TextOnlyRenderer from './renderers/TextOnlyRenderer';
9
- import Color4 from '../Color4';
10
-
11
- export enum RenderingMode {
12
- DummyRenderer,
13
- CanvasRenderer,
14
- // SVGRenderer is not supported by the main display
15
- }
16
-
17
- /**
18
- * Handles `HTMLCanvasElement`s (or other drawing surfaces if being used) used to display the editor's contents.
19
- *
20
- * @example
21
- * ```
22
- * const editor = new Editor(document.body);
23
- * const w = editor.display.width;
24
- * const h = editor.display.height;
25
- * const center = Vec2.of(w / 2, h / 2);
26
- * const colorAtCenter = editor.display.getColorAt(center);
27
- * ```
28
- */
29
- export default class Display {
30
- private dryInkRenderer: AbstractRenderer;
31
- private wetInkRenderer: AbstractRenderer;
32
- private textRenderer: TextOnlyRenderer;
33
- private textRerenderOutput: HTMLElement|null = null;
34
- private cache: RenderingCache;
35
- private resizeSurfacesCallback?: ()=> void;
36
- private flattenCallback?: ()=> void;
37
-
38
- /** @internal */
39
- public constructor(
40
- private editor: Editor, mode: RenderingMode, private parent: HTMLElement|null
41
- ) {
42
- if (mode === RenderingMode.CanvasRenderer) {
43
- this.initializeCanvasRendering();
44
- } else if (mode === RenderingMode.DummyRenderer) {
45
- this.dryInkRenderer = new DummyRenderer(editor.viewport);
46
- this.wetInkRenderer = new DummyRenderer(editor.viewport);
47
- } else {
48
- throw new Error(`Unknown rendering mode, ${mode}!`);
49
- }
50
-
51
- this.textRenderer = new TextOnlyRenderer(editor.viewport, editor.localization);
52
- this.initializeTextRendering();
53
-
54
- const cacheBlockResolution = Vec2.of(600, 600);
55
- this.cache = new RenderingCache({
56
- createRenderer: () => {
57
- if (mode === RenderingMode.DummyRenderer) {
58
- return new DummyRenderer(editor.viewport);
59
- } else if (mode !== RenderingMode.CanvasRenderer) {
60
- throw new Error('Unspported rendering mode');
61
- }
62
-
63
- // Make the canvas slightly larger than each cache block to prevent
64
- // seams.
65
- const canvas = document.createElement('canvas');
66
- canvas.width = cacheBlockResolution.x + 1;
67
- canvas.height = cacheBlockResolution.y + 1;
68
- const ctx = canvas.getContext('2d');
69
-
70
- return new CanvasRenderer(ctx!, editor.viewport);
71
- },
72
- isOfCorrectType: (renderer) => {
73
- return this.dryInkRenderer.canRenderFromWithoutDataLoss(renderer);
74
- },
75
- blockResolution: cacheBlockResolution,
76
- cacheSize: 600 * 600 * 4 * 90,
77
- maxScale: 1.3,
78
-
79
- // Require about 20 strokes with 4 parts each to cache an image in one of the
80
- // parts of the cache grid.
81
- minProportionalRenderTimePerCache: 20 * 4,
82
-
83
- // Require about 105 strokes with 4 parts each to use the cache at all.
84
- minProportionalRenderTimeToUseCache: 105 * 4,
85
- });
86
-
87
- this.editor.notifier.on(EditorEventType.DisplayResized, event => {
88
- if (event.kind !== EditorEventType.DisplayResized) {
89
- throw new Error('Mismatched event.kinds!');
90
- }
91
-
92
- this.resizeSurfacesCallback?.();
93
- });
94
- }
95
-
96
- /**
97
- * @returns the visible width of the display (e.g. how much
98
- * space the display's element takes up in the x direction
99
- * in the DOM).
100
- */
101
- public get width(): number {
102
- return this.dryInkRenderer.displaySize().x;
103
- }
104
-
105
- public get height(): number {
106
- return this.dryInkRenderer.displaySize().y;
107
- }
108
-
109
- /** @internal */
110
- public getCache() {
111
- return this.cache;
112
- }
113
-
114
- /**
115
- * @returns the color at the given point on the dry ink renderer, or `null` if `screenPos`
116
- * is not on the display.
117
- */
118
- public getColorAt = (_screenPos: Point2): Color4|null => {
119
- return null;
120
- };
121
-
122
- private initializeCanvasRendering() {
123
- const dryInkCanvas = document.createElement('canvas');
124
- const wetInkCanvas = document.createElement('canvas');
125
- const dryInkCtx = dryInkCanvas.getContext('2d')!;
126
- const wetInkCtx = wetInkCanvas.getContext('2d')!;
127
-
128
- this.dryInkRenderer = new CanvasRenderer(dryInkCtx, this.editor.viewport);
129
- this.wetInkRenderer = new CanvasRenderer(wetInkCtx, this.editor.viewport);
130
-
131
- dryInkCanvas.className = 'dryInkCanvas';
132
- wetInkCanvas.className = 'wetInkCanvas';
133
-
134
- if (this.parent) {
135
- this.parent.appendChild(dryInkCanvas);
136
- this.parent.appendChild(wetInkCanvas);
137
- }
138
-
139
- this.resizeSurfacesCallback = () => {
140
- const hasSizeMismatch = (canvas: HTMLCanvasElement): boolean => {
141
- return canvas.clientHeight !== canvas.height || canvas.clientWidth !== canvas.width;
142
- };
143
-
144
- // Ensure that the drawing surfaces sizes match the
145
- // canvas' sizes to prevent stretching.
146
- if (hasSizeMismatch(dryInkCanvas) || hasSizeMismatch(wetInkCanvas)) {
147
- dryInkCanvas.width = dryInkCanvas.clientWidth;
148
- dryInkCanvas.height = dryInkCanvas.clientHeight;
149
- wetInkCanvas.width = wetInkCanvas.clientWidth;
150
- wetInkCanvas.height = wetInkCanvas.clientHeight;
151
-
152
- this.editor.notifier.dispatch(EditorEventType.DisplayResized, {
153
- kind: EditorEventType.DisplayResized,
154
- newSize: Vec2.of(
155
- this.width,
156
- this.height,
157
- ),
158
- });
159
- }
160
- };
161
- this.resizeSurfacesCallback();
162
-
163
- this.flattenCallback = () => {
164
- dryInkCtx.drawImage(wetInkCanvas, 0, 0);
165
- };
166
-
167
- this.getColorAt = (screenPos: Point2) => {
168
- const pixel = dryInkCtx.getImageData(screenPos.x, screenPos.y, 1, 1);
169
- const data = pixel?.data;
170
-
171
- if (data) {
172
- const color = Color4.ofRGBA(data[0] / 255, data[1] / 255, data[2] / 255, data[3] / 255);
173
- return color;
174
- }
175
- return null;
176
- };
177
- }
178
-
179
- private initializeTextRendering() {
180
- const textRendererOutputContainer = document.createElement('div');
181
- textRendererOutputContainer.classList.add('textRendererOutputContainer');
182
-
183
- const rerenderButton = document.createElement('button');
184
- rerenderButton.classList.add('rerenderButton');
185
- rerenderButton.innerText = this.editor.localization.rerenderAsText;
186
-
187
- this.textRerenderOutput = document.createElement('div');
188
- this.textRerenderOutput.setAttribute('aria-live', 'polite');
189
-
190
- rerenderButton.onclick = () => {
191
- this.rerenderAsText();
192
- };
193
-
194
- textRendererOutputContainer.replaceChildren(rerenderButton, this.textRerenderOutput);
195
- this.editor.createHTMLOverlay(textRendererOutputContainer);
196
- }
197
-
198
- /**
199
- * Rerenders the text-based display.
200
- * The text-based display is intended for screen readers and can be navigated to by pressing `tab`.
201
- */
202
- public rerenderAsText() {
203
- this.textRenderer.clear();
204
- this.editor.image.render(this.textRenderer, this.editor.viewport);
205
-
206
- if (this.textRerenderOutput) {
207
- this.textRerenderOutput.innerText = this.textRenderer.getDescription();
208
- }
209
- }
210
-
211
- /**
212
- * Clears the drawing surfaces and otherwise prepares for a rerender.
213
- *
214
- * @returns the dry ink renderer.
215
- */
216
- public startRerender(): AbstractRenderer {
217
- this.resizeSurfacesCallback?.();
218
- this.wetInkRenderer.clear();
219
- this.dryInkRenderer.clear();
220
-
221
- return this.dryInkRenderer;
222
- }
223
-
224
- /**
225
- * If `draftMode`, the dry ink renderer is configured to render
226
- * low-quality output.
227
- */
228
- public setDraftMode(draftMode: boolean) {
229
- this.dryInkRenderer.setDraftMode(draftMode);
230
- }
231
-
232
- /** @internal */
233
- public getDryInkRenderer(): AbstractRenderer {
234
- return this.dryInkRenderer;
235
- }
236
-
237
- /**
238
- * @returns The renderer used for showing action previews (e.g. an unfinished stroke).
239
- * The `wetInkRenderer`'s surface is stacked above the `dryInkRenderer`'s.
240
- */
241
- public getWetInkRenderer(): AbstractRenderer {
242
- return this.wetInkRenderer;
243
- }
244
-
245
- /** Re-renders the contents of the wetInkRenderer onto the dryInkRenderer. */
246
- public flatten() {
247
- this.flattenCallback?.();
248
- }
249
- }