js-draw 0.0.8 → 0.1.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 (110) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/bundle.js +1 -1
  3. package/dist/src/Editor.d.ts +2 -2
  4. package/dist/src/Editor.js +16 -8
  5. package/dist/src/EditorImage.d.ts +17 -9
  6. package/dist/src/EditorImage.js +41 -35
  7. package/dist/src/SVGLoader.d.ts +3 -2
  8. package/dist/src/SVGLoader.js +9 -7
  9. package/dist/src/UndoRedoHistory.js +6 -0
  10. package/dist/src/Viewport.d.ts +5 -1
  11. package/dist/src/Viewport.js +41 -0
  12. package/dist/src/components/AbstractComponent.d.ts +3 -2
  13. package/dist/src/components/AbstractComponent.js +3 -0
  14. package/dist/src/components/SVGGlobalAttributesObject.d.ts +1 -1
  15. package/dist/src/components/SVGGlobalAttributesObject.js +1 -1
  16. package/dist/src/components/Stroke.d.ts +1 -1
  17. package/dist/src/components/UnknownSVGObject.d.ts +1 -1
  18. package/dist/src/components/UnknownSVGObject.js +1 -1
  19. package/dist/src/components/builders/ArrowBuilder.d.ts +1 -1
  20. package/dist/src/components/builders/FreehandLineBuilder.d.ts +1 -1
  21. package/dist/src/components/builders/LineBuilder.d.ts +1 -1
  22. package/dist/src/components/builders/RectangleBuilder.d.ts +1 -1
  23. package/dist/src/components/builders/types.d.ts +1 -1
  24. package/dist/src/geometry/Mat33.js +3 -0
  25. package/dist/src/geometry/Path.d.ts +1 -1
  26. package/dist/src/geometry/Path.js +5 -3
  27. package/dist/src/geometry/Rect2.d.ts +1 -0
  28. package/dist/src/geometry/Rect2.js +28 -1
  29. package/dist/src/{Display.d.ts → rendering/Display.d.ts} +6 -2
  30. package/dist/src/{Display.js → rendering/Display.js} +36 -4
  31. package/dist/src/rendering/caching/CacheRecord.d.ts +19 -0
  32. package/dist/src/rendering/caching/CacheRecord.js +51 -0
  33. package/dist/src/rendering/caching/CacheRecordManager.d.ts +11 -0
  34. package/dist/src/rendering/caching/CacheRecordManager.js +39 -0
  35. package/dist/src/rendering/caching/RenderingCache.d.ts +12 -0
  36. package/dist/src/rendering/caching/RenderingCache.js +36 -0
  37. package/dist/src/rendering/caching/RenderingCacheNode.d.ts +28 -0
  38. package/dist/src/rendering/caching/RenderingCacheNode.js +294 -0
  39. package/dist/src/rendering/caching/testUtils.d.ts +9 -0
  40. package/dist/src/rendering/caching/testUtils.js +20 -0
  41. package/dist/src/rendering/caching/types.d.ts +20 -0
  42. package/dist/src/rendering/caching/types.js +1 -0
  43. package/dist/src/rendering/{AbstractRenderer.d.ts → renderers/AbstractRenderer.d.ts} +19 -8
  44. package/dist/src/rendering/{AbstractRenderer.js → renderers/AbstractRenderer.js} +37 -2
  45. package/dist/src/rendering/{CanvasRenderer.d.ts → renderers/CanvasRenderer.d.ts} +14 -5
  46. package/dist/src/rendering/renderers/CanvasRenderer.js +164 -0
  47. package/dist/src/rendering/{DummyRenderer.d.ts → renderers/DummyRenderer.d.ts} +9 -5
  48. package/dist/src/rendering/{DummyRenderer.js → renderers/DummyRenderer.js} +35 -4
  49. package/dist/src/rendering/{SVGRenderer.d.ts → renderers/SVGRenderer.d.ts} +4 -3
  50. package/dist/src/rendering/{SVGRenderer.js → renderers/SVGRenderer.js} +14 -11
  51. package/dist/src/testing/createEditor.d.ts +3 -0
  52. package/dist/src/testing/createEditor.js +3 -0
  53. package/dist/src/toolbar/HTMLToolbar.js +11 -2
  54. package/dist/src/toolbar/localization.d.ts +1 -0
  55. package/dist/src/toolbar/localization.js +1 -0
  56. package/dist/src/tools/BaseTool.js +4 -0
  57. package/dist/src/tools/PanZoom.js +3 -0
  58. package/dist/src/tools/SelectionTool.d.ts +3 -0
  59. package/dist/src/tools/SelectionTool.js +22 -24
  60. package/dist/src/tools/ToolController.js +3 -0
  61. package/dist/src/tools/UndoRedoShortcut.js +23 -0
  62. package/dist/src/tools/localization.js +1 -0
  63. package/dist/src/types.d.ts +2 -1
  64. package/package.json +2 -2
  65. package/src/Editor.ts +17 -8
  66. package/src/EditorImage.test.ts +2 -2
  67. package/src/EditorImage.ts +53 -41
  68. package/src/SVGLoader.ts +11 -8
  69. package/src/Viewport.ts +56 -0
  70. package/src/components/AbstractComponent.ts +6 -2
  71. package/src/components/SVGGlobalAttributesObject.ts +2 -2
  72. package/src/components/Stroke.ts +1 -1
  73. package/src/components/UnknownSVGObject.ts +2 -2
  74. package/src/components/builders/ArrowBuilder.ts +1 -1
  75. package/src/components/builders/FreehandLineBuilder.ts +1 -1
  76. package/src/components/builders/LineBuilder.ts +1 -1
  77. package/src/components/builders/RectangleBuilder.ts +1 -1
  78. package/src/components/builders/types.ts +1 -1
  79. package/src/geometry/Mat33.ts +3 -0
  80. package/src/geometry/Path.toString.test.ts +12 -2
  81. package/src/geometry/Path.ts +8 -4
  82. package/src/geometry/Rect2.test.ts +38 -8
  83. package/src/geometry/Rect2.ts +32 -1
  84. package/src/{Display.ts → rendering/Display.ts} +42 -6
  85. package/src/rendering/caching/CacheRecord.test.ts +49 -0
  86. package/src/rendering/caching/CacheRecord.ts +72 -0
  87. package/src/rendering/caching/CacheRecordManager.ts +55 -0
  88. package/src/rendering/caching/RenderingCache.test.ts +44 -0
  89. package/src/rendering/caching/RenderingCache.ts +56 -0
  90. package/src/rendering/caching/RenderingCacheNode.ts +365 -0
  91. package/src/rendering/caching/testUtils.ts +34 -0
  92. package/src/rendering/caching/types.ts +35 -0
  93. package/src/rendering/{AbstractRenderer.ts → renderers/AbstractRenderer.ts} +57 -8
  94. package/src/rendering/renderers/CanvasRenderer.ts +219 -0
  95. package/src/rendering/renderers/DummyRenderer.test.ts +43 -0
  96. package/src/rendering/{DummyRenderer.ts → renderers/DummyRenderer.ts} +50 -7
  97. package/src/rendering/{SVGRenderer.ts → renderers/SVGRenderer.ts} +17 -13
  98. package/src/testing/createEditor.ts +1 -1
  99. package/src/toolbar/HTMLToolbar.ts +13 -2
  100. package/src/toolbar/localization.ts +2 -0
  101. package/src/tools/PanZoom.ts +3 -0
  102. package/src/tools/SelectionTool.test.ts +1 -1
  103. package/src/tools/SelectionTool.ts +28 -33
  104. package/src/types.ts +10 -3
  105. package/tsconfig.json +1 -0
  106. package/dist/__mocks__/coloris.d.ts +0 -2
  107. package/dist/__mocks__/coloris.js +0 -5
  108. package/dist/src/htmlUtil.d.ts +0 -1
  109. package/dist/src/rendering/CanvasRenderer.js +0 -108
  110. package/src/rendering/CanvasRenderer.ts +0 -141
@@ -0,0 +1,20 @@
1
+ import { Vec2 } from '../../geometry/Vec2';
2
+ import DummyRenderer from '../renderers/DummyRenderer';
3
+ import createEditor from '../../testing/createEditor';
4
+ import RenderingCache from './RenderingCache';
5
+ // Override any default test options with [cacheOptions]
6
+ export const createCache = (onRenderAlloc, cacheOptions) => {
7
+ const editor = createEditor();
8
+ const cache = new RenderingCache(Object.assign({ createRenderer() {
9
+ const renderer = new DummyRenderer(editor.viewport);
10
+ onRenderAlloc === null || onRenderAlloc === void 0 ? void 0 : onRenderAlloc(renderer);
11
+ return renderer;
12
+ },
13
+ isOfCorrectType(renderer) {
14
+ return renderer instanceof DummyRenderer;
15
+ }, blockResolution: Vec2.of(500, 500), cacheSize: 500 * 10 * 4, maxScale: 2, minComponentsPerCache: 0 }, cacheOptions));
16
+ return {
17
+ cache,
18
+ editor
19
+ };
20
+ };
@@ -0,0 +1,20 @@
1
+ import { Vec2 } from '../../geometry/Vec2';
2
+ import AbstractRenderer from '../renderers/AbstractRenderer';
3
+ import { CacheRecordManager } from './CacheRecordManager';
4
+ export declare type CacheAddress = number;
5
+ export declare type BeforeDeallocCallback = () => void;
6
+ export interface CacheProps {
7
+ createRenderer(): AbstractRenderer;
8
+ isOfCorrectType(renderer: AbstractRenderer): boolean;
9
+ blockResolution: Vec2;
10
+ cacheSize: number;
11
+ maxScale: number;
12
+ minComponentsPerCache: number;
13
+ }
14
+ export interface PartialCacheState {
15
+ currentRenderingCycle: number;
16
+ props: CacheProps;
17
+ }
18
+ export interface CacheState extends PartialCacheState {
19
+ recordManager: CacheRecordManager;
20
+ }
@@ -0,0 +1 @@
1
+ export {};
@@ -1,8 +1,9 @@
1
- import Color4 from '../Color4';
2
- import { PathCommand } from '../geometry/Path';
3
- import Rect2 from '../geometry/Rect2';
4
- import { Point2, Vec2 } from '../geometry/Vec2';
5
- import Viewport from '../Viewport';
1
+ import Color4 from '../../Color4';
2
+ import Mat33 from '../../geometry/Mat33';
3
+ import { PathCommand } from '../../geometry/Path';
4
+ import Rect2 from '../../geometry/Rect2';
5
+ import { Point2, Vec2 } from '../../geometry/Vec2';
6
+ import Viewport from '../../Viewport';
6
7
  export interface RenderingStyle {
7
8
  fill: Color4;
8
9
  stroke?: {
@@ -16,8 +17,10 @@ export interface RenderablePathSpec {
16
17
  style: RenderingStyle;
17
18
  }
18
19
  export default abstract class AbstractRenderer {
19
- protected viewport: Viewport;
20
+ private viewport;
21
+ private selfTransform;
20
22
  protected constructor(viewport: Viewport);
23
+ protected getViewport(): Viewport;
21
24
  abstract displaySize(): Vec2;
22
25
  abstract clear(): void;
23
26
  protected abstract beginPath(startPoint: Point2): void;
@@ -26,13 +29,21 @@ export default abstract class AbstractRenderer {
26
29
  protected abstract moveTo(point: Point2): void;
27
30
  protected abstract traceCubicBezierCurve(p1: Point2, p2: Point2, p3: Point2): void;
28
31
  protected abstract traceQuadraticBezierCurve(controlPoint: Point2, endPoint: Point2): void;
29
- private objectLevel;
32
+ abstract isTooSmallToRender(rect: Rect2): boolean;
33
+ setDraftMode(_draftMode: boolean): void;
34
+ protected objectLevel: number;
30
35
  private currentPaths;
31
36
  private flushPath;
32
37
  drawPath(path: RenderablePathSpec): void;
33
38
  drawRect(rect: Rect2, lineWidth: number, lineFill: RenderingStyle): void;
34
- startObject(_boundingBox: Rect2): void;
39
+ startObject(_boundingBox: Rect2, _clip?: boolean): void;
35
40
  endObject(): void;
36
41
  protected getNestingLevel(): number;
37
42
  abstract drawPoints(...points: Point2[]): void;
43
+ canRenderFromWithoutDataLoss(_other: AbstractRenderer): boolean;
44
+ renderFromOtherOfSameType(_renderTo: Mat33, other: AbstractRenderer): void;
45
+ setTransform(transform: Mat33 | null): void;
46
+ getCanvasToScreenTransform(): Mat33;
47
+ canvasToScreen(vec: Vec2): Vec2;
48
+ getSizeOfCanvasPixelOnScreen(): number;
38
49
  }
@@ -1,4 +1,5 @@
1
- import Path, { PathCommandType } from '../geometry/Path';
1
+ import Path, { PathCommandType } from '../../geometry/Path';
2
+ import { Vec2 } from '../../geometry/Vec2';
2
3
  const stylesEqual = (a, b) => {
3
4
  var _a, _b, _c, _d, _e;
4
5
  return a === b || (a.fill.eq(b.fill)
@@ -8,9 +9,15 @@ const stylesEqual = (a, b) => {
8
9
  export default class AbstractRenderer {
9
10
  constructor(viewport) {
10
11
  this.viewport = viewport;
12
+ // If null, this' transformation is linked to the Viewport
13
+ this.selfTransform = null;
11
14
  this.objectLevel = 0;
12
15
  this.currentPaths = null;
13
16
  }
17
+ // this.canvasToScreen, etc. should be used instead of the corresponding
18
+ // methods on Viewport.
19
+ getViewport() { return this.viewport; }
20
+ setDraftMode(_draftMode) { }
14
21
  flushPath() {
15
22
  if (!this.currentPaths) {
16
23
  return;
@@ -67,7 +74,8 @@ export default class AbstractRenderer {
67
74
  this.drawPath(path.toRenderable(lineFill));
68
75
  }
69
76
  // Note the start/end of an object with the given bounding box.
70
- startObject(_boundingBox) {
77
+ // Renderers are not required to support [clip]
78
+ startObject(_boundingBox, _clip) {
71
79
  this.currentPaths = [];
72
80
  this.objectLevel++;
73
81
  }
@@ -83,4 +91,31 @@ export default class AbstractRenderer {
83
91
  getNestingLevel() {
84
92
  return this.objectLevel;
85
93
  }
94
+ // Returns true iff other can be rendered onto this without data loss.
95
+ canRenderFromWithoutDataLoss(_other) {
96
+ return false;
97
+ }
98
+ // MUST throw if other and this are not of the same base class.
99
+ renderFromOtherOfSameType(_renderTo, other) {
100
+ throw new Error(`Unable to render from ${other}: Not implemented`);
101
+ }
102
+ // Set a transformation to apply to things before rendering,
103
+ // replacing the viewport's transform.
104
+ setTransform(transform) {
105
+ this.selfTransform = transform;
106
+ }
107
+ // Get the matrix that transforms a vector on the canvas to a vector on this'
108
+ // rendering target.
109
+ getCanvasToScreenTransform() {
110
+ if (this.selfTransform) {
111
+ return this.selfTransform;
112
+ }
113
+ return this.viewport.canvasToScreenTransform;
114
+ }
115
+ canvasToScreen(vec) {
116
+ return this.getCanvasToScreenTransform().transformVec2(vec);
117
+ }
118
+ getSizeOfCanvasPixelOnScreen() {
119
+ return this.getCanvasToScreenTransform().transformVec3(Vec2.unitX).length();
120
+ }
86
121
  }
@@ -1,13 +1,20 @@
1
- import Rect2 from '../geometry/Rect2';
2
- import { Point2, Vec2 } from '../geometry/Vec2';
3
- import Vec3 from '../geometry/Vec3';
4
- import Viewport from '../Viewport';
1
+ import Mat33 from '../../geometry/Mat33';
2
+ import Rect2 from '../../geometry/Rect2';
3
+ import { Point2, Vec2 } from '../../geometry/Vec2';
4
+ import Vec3 from '../../geometry/Vec3';
5
+ import Viewport from '../../Viewport';
5
6
  import AbstractRenderer, { RenderablePathSpec, RenderingStyle } from './AbstractRenderer';
6
7
  export default class CanvasRenderer extends AbstractRenderer {
7
8
  private ctx;
8
9
  private ignoreObjectsAboveLevel;
9
10
  private ignoringObject;
11
+ private minSquareCurveApproxDist;
12
+ private minRenderSizeAnyDimen;
13
+ private minRenderSizeBothDimens;
10
14
  constructor(ctx: CanvasRenderingContext2D, viewport: Viewport);
15
+ canRenderFromWithoutDataLoss(other: AbstractRenderer): boolean;
16
+ renderFromOtherOfSameType(transformBy: Mat33, other: AbstractRenderer): void;
17
+ setDraftMode(draftMode: boolean): void;
11
18
  displaySize(): Vec2;
12
19
  clear(): void;
13
20
  protected beginPath(startPoint: Point2): void;
@@ -17,7 +24,9 @@ export default class CanvasRenderer extends AbstractRenderer {
17
24
  protected traceCubicBezierCurve(p1: Point2, p2: Point2, p3: Point2): void;
18
25
  protected traceQuadraticBezierCurve(controlPoint: Vec3, endPoint: Vec3): void;
19
26
  drawPath(path: RenderablePathSpec): void;
20
- startObject(boundingBox: Rect2): void;
27
+ private clipLevels;
28
+ startObject(boundingBox: Rect2, clip: boolean): void;
21
29
  endObject(): void;
22
30
  drawPoints(...points: Point2[]): void;
31
+ isTooSmallToRender(rect: Rect2): boolean;
23
32
  }
@@ -0,0 +1,164 @@
1
+ import Color4 from '../../Color4';
2
+ import { Vec2 } from '../../geometry/Vec2';
3
+ import AbstractRenderer from './AbstractRenderer';
4
+ export default class CanvasRenderer extends AbstractRenderer {
5
+ constructor(ctx, viewport) {
6
+ super(viewport);
7
+ this.ctx = ctx;
8
+ this.ignoreObjectsAboveLevel = null;
9
+ this.ignoringObject = false;
10
+ this.clipLevels = [];
11
+ this.setDraftMode(false);
12
+ }
13
+ canRenderFromWithoutDataLoss(other) {
14
+ return other instanceof CanvasRenderer;
15
+ }
16
+ renderFromOtherOfSameType(transformBy, other) {
17
+ if (!(other instanceof CanvasRenderer)) {
18
+ throw new Error(`${other} cannot be rendered onto ${this}`);
19
+ }
20
+ transformBy = this.getCanvasToScreenTransform().rightMul(transformBy);
21
+ this.ctx.save();
22
+ // From MDN, transform(a,b,c,d,e,f)
23
+ // takes input such that
24
+ // ⎡ a c e ⎤
25
+ // ⎢ b d f ⎥ transforms content drawn to [ctx].
26
+ // ⎣ 0 0 1 ⎦
27
+ this.ctx.transform(transformBy.a1, transformBy.b1, // a, b
28
+ transformBy.a2, transformBy.b2, // c, d
29
+ transformBy.a3, transformBy.b3);
30
+ this.ctx.drawImage(other.ctx.canvas, 0, 0);
31
+ this.ctx.restore();
32
+ }
33
+ // Set parameters for lower/higher quality rendering
34
+ setDraftMode(draftMode) {
35
+ if (draftMode) {
36
+ this.minSquareCurveApproxDist = 64;
37
+ this.minRenderSizeBothDimens = 8;
38
+ this.minRenderSizeAnyDimen = 2;
39
+ }
40
+ else {
41
+ this.minSquareCurveApproxDist = 1;
42
+ this.minRenderSizeBothDimens = 1;
43
+ this.minRenderSizeAnyDimen = 0;
44
+ }
45
+ }
46
+ displaySize() {
47
+ return Vec2.of(this.ctx.canvas.clientWidth, this.ctx.canvas.clientHeight);
48
+ }
49
+ clear() {
50
+ this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
51
+ }
52
+ beginPath(startPoint) {
53
+ startPoint = this.canvasToScreen(startPoint);
54
+ this.ctx.beginPath();
55
+ this.ctx.moveTo(startPoint.x, startPoint.y);
56
+ }
57
+ endPath(style) {
58
+ this.ctx.fillStyle = style.fill.toHexString();
59
+ this.ctx.fill();
60
+ if (style.stroke) {
61
+ this.ctx.strokeStyle = style.stroke.color.toHexString();
62
+ this.ctx.lineWidth = this.getSizeOfCanvasPixelOnScreen() * style.stroke.width;
63
+ this.ctx.stroke();
64
+ }
65
+ this.ctx.closePath();
66
+ }
67
+ lineTo(point) {
68
+ point = this.canvasToScreen(point);
69
+ this.ctx.lineTo(point.x, point.y);
70
+ }
71
+ moveTo(point) {
72
+ point = this.canvasToScreen(point);
73
+ this.ctx.moveTo(point.x, point.y);
74
+ }
75
+ traceCubicBezierCurve(p1, p2, p3) {
76
+ p1 = this.canvasToScreen(p1);
77
+ p2 = this.canvasToScreen(p2);
78
+ p3 = this.canvasToScreen(p3);
79
+ // Approximate the curve if small enough.
80
+ const delta1 = p2.minus(p1);
81
+ const delta2 = p3.minus(p2);
82
+ if (delta1.magnitudeSquared() < this.minSquareCurveApproxDist
83
+ && delta2.magnitudeSquared() < this.minSquareCurveApproxDist) {
84
+ this.ctx.lineTo(p3.x, p3.y);
85
+ }
86
+ else {
87
+ this.ctx.bezierCurveTo(p1.x, p1.y, p2.x, p2.y, p3.x, p3.y);
88
+ }
89
+ }
90
+ traceQuadraticBezierCurve(controlPoint, endPoint) {
91
+ controlPoint = this.canvasToScreen(controlPoint);
92
+ endPoint = this.canvasToScreen(endPoint);
93
+ // Approximate the curve with a line if small enough
94
+ const delta = controlPoint.minus(endPoint);
95
+ if (delta.magnitudeSquared() < this.minSquareCurveApproxDist) {
96
+ this.ctx.lineTo(endPoint.x, endPoint.y);
97
+ }
98
+ else {
99
+ this.ctx.quadraticCurveTo(controlPoint.x, controlPoint.y, endPoint.x, endPoint.y);
100
+ }
101
+ }
102
+ drawPath(path) {
103
+ if (this.ignoringObject) {
104
+ return;
105
+ }
106
+ super.drawPath(path);
107
+ }
108
+ startObject(boundingBox, clip) {
109
+ if (this.isTooSmallToRender(boundingBox)) {
110
+ this.ignoreObjectsAboveLevel = this.getNestingLevel();
111
+ this.ignoringObject = true;
112
+ }
113
+ super.startObject(boundingBox);
114
+ if (!this.ignoringObject && clip) {
115
+ this.clipLevels.push(this.objectLevel);
116
+ this.ctx.save();
117
+ this.ctx.beginPath();
118
+ for (const corner of boundingBox.corners) {
119
+ const screenCorner = this.canvasToScreen(corner);
120
+ this.ctx.lineTo(screenCorner.x, screenCorner.y);
121
+ }
122
+ this.ctx.clip();
123
+ }
124
+ }
125
+ endObject() {
126
+ if (!this.ignoringObject && this.clipLevels.length > 0) {
127
+ if (this.clipLevels[this.clipLevels.length - 1] === this.objectLevel) {
128
+ this.ctx.restore();
129
+ this.clipLevels.pop();
130
+ }
131
+ }
132
+ super.endObject();
133
+ // If exiting an object with a too-small-to-draw bounding box,
134
+ if (this.ignoreObjectsAboveLevel !== null && this.getNestingLevel() <= this.ignoreObjectsAboveLevel) {
135
+ this.ignoreObjectsAboveLevel = null;
136
+ this.ignoringObject = false;
137
+ }
138
+ }
139
+ drawPoints(...points) {
140
+ const pointRadius = 10;
141
+ for (let i = 0; i < points.length; i++) {
142
+ const point = this.canvasToScreen(points[i]);
143
+ this.ctx.beginPath();
144
+ this.ctx.arc(point.x, point.y, pointRadius, 0, Math.PI * 2);
145
+ this.ctx.fillStyle = Color4.ofRGBA(0.5 + Math.sin(i) / 2, 1.0, 0.5 + Math.cos(i * 0.2) / 4, 0.5).toHexString();
146
+ this.ctx.fill();
147
+ this.ctx.stroke();
148
+ this.ctx.closePath();
149
+ this.ctx.textAlign = 'center';
150
+ this.ctx.textBaseline = 'middle';
151
+ this.ctx.fillStyle = 'black';
152
+ this.ctx.fillText(`${i}`, point.x, point.y, pointRadius * 2);
153
+ }
154
+ }
155
+ isTooSmallToRender(rect) {
156
+ // Should we ignore all objects within this object's bbox?
157
+ const diagonal = this.getCanvasToScreenTransform().transformVec3(rect.size);
158
+ const bothDimenMinSize = this.minRenderSizeBothDimens;
159
+ const bothTooSmall = Math.abs(diagonal.x) < bothDimenMinSize && Math.abs(diagonal.y) < bothDimenMinSize;
160
+ const anyDimenMinSize = this.minRenderSizeAnyDimen;
161
+ const anyTooSmall = Math.abs(diagonal.x) < anyDimenMinSize || Math.abs(diagonal.y) < anyDimenMinSize;
162
+ return bothTooSmall || anyTooSmall;
163
+ }
164
+ }
@@ -1,7 +1,8 @@
1
- import Rect2 from '../geometry/Rect2';
2
- import { Point2, Vec2 } from '../geometry/Vec2';
3
- import Vec3 from '../geometry/Vec3';
4
- import Viewport from '../Viewport';
1
+ import Mat33 from '../../geometry/Mat33';
2
+ import Rect2 from '../../geometry/Rect2';
3
+ import { Point2, Vec2 } from '../../geometry/Vec2';
4
+ import Vec3 from '../../geometry/Vec3';
5
+ import Viewport from '../../Viewport';
5
6
  import AbstractRenderer, { RenderingStyle } from './AbstractRenderer';
6
7
  export default class DummyRenderer extends AbstractRenderer {
7
8
  clearedCount: number;
@@ -20,6 +21,9 @@ export default class DummyRenderer extends AbstractRenderer {
20
21
  protected traceCubicBezierCurve(p1: Vec3, p2: Vec3, p3: Vec3): void;
21
22
  protected traceQuadraticBezierCurve(controlPoint: Vec3, endPoint: Vec3): void;
22
23
  drawPoints(..._points: Vec3[]): void;
23
- startObject(boundingBox: Rect2): void;
24
+ startObject(boundingBox: Rect2, _clip: boolean): void;
24
25
  endObject(): void;
26
+ isTooSmallToRender(_rect: Rect2): boolean;
27
+ canRenderFromWithoutDataLoss(other: AbstractRenderer): boolean;
28
+ renderFromOtherOfSameType(transform: Mat33, other: AbstractRenderer): void;
25
29
  }
@@ -1,5 +1,5 @@
1
1
  // Renderer that outputs nothing. Useful for automated tests.
2
- import { Vec2 } from '../geometry/Vec2';
2
+ import { Vec2 } from '../../geometry/Vec2';
3
3
  import AbstractRenderer from './AbstractRenderer';
4
4
  export default class DummyRenderer extends AbstractRenderer {
5
5
  constructor(viewport) {
@@ -14,8 +14,15 @@ export default class DummyRenderer extends AbstractRenderer {
14
14
  this.pointBuffer = [];
15
15
  }
16
16
  displaySize() {
17
- // Return a dummy
18
- return Vec2.of(640, 480);
17
+ // Do we have a stored viewport size?
18
+ const viewportSize = this.getViewport().getResolution();
19
+ // Don't use a 0x0 viewport — DummyRenderer is often used
20
+ // for tests that run without a display, so pretend we have a
21
+ // reasonable-sized display.
22
+ if (viewportSize.x === 0 || viewportSize.y === 0) {
23
+ return Vec2.of(640, 480);
24
+ }
25
+ return viewportSize;
19
26
  }
20
27
  clear() {
21
28
  this.clearedCount++;
@@ -35,18 +42,25 @@ export default class DummyRenderer extends AbstractRenderer {
35
42
  this.lastFillStyle = style;
36
43
  }
37
44
  lineTo(point) {
45
+ point = this.canvasToScreen(point);
38
46
  this.lastPoint = point;
39
47
  this.pointBuffer.push(point);
40
48
  }
41
49
  moveTo(point) {
50
+ point = this.canvasToScreen(point);
42
51
  this.lastPoint = point;
43
52
  this.pointBuffer.push(point);
44
53
  }
45
54
  traceCubicBezierCurve(p1, p2, p3) {
55
+ p1 = this.canvasToScreen(p1);
56
+ p2 = this.canvasToScreen(p2);
57
+ p3 = this.canvasToScreen(p3);
46
58
  this.lastPoint = p3;
47
59
  this.pointBuffer.push(p1, p2, p3);
48
60
  }
49
61
  traceQuadraticBezierCurve(controlPoint, endPoint) {
62
+ controlPoint = this.canvasToScreen(controlPoint);
63
+ endPoint = this.canvasToScreen(endPoint);
50
64
  this.lastPoint = endPoint;
51
65
  this.pointBuffer.push(controlPoint, endPoint);
52
66
  }
@@ -54,7 +68,7 @@ export default class DummyRenderer extends AbstractRenderer {
54
68
  // drawPoints is intended for debugging.
55
69
  // As such, it is unlikely to be the target of automated tests.
56
70
  }
57
- startObject(boundingBox) {
71
+ startObject(boundingBox, _clip) {
58
72
  super.startObject(boundingBox);
59
73
  this.objectNestingLevel += 1;
60
74
  }
@@ -62,4 +76,21 @@ export default class DummyRenderer extends AbstractRenderer {
62
76
  super.endObject();
63
77
  this.objectNestingLevel -= 1;
64
78
  }
79
+ isTooSmallToRender(_rect) {
80
+ return false;
81
+ }
82
+ canRenderFromWithoutDataLoss(other) {
83
+ return other instanceof DummyRenderer;
84
+ }
85
+ renderFromOtherOfSameType(transform, other) {
86
+ if (!(other instanceof DummyRenderer)) {
87
+ throw new Error(`${other} cannot be rendered onto ${this}`);
88
+ }
89
+ this.renderedPathCount += other.renderedPathCount;
90
+ this.lastFillStyle = other.lastFillStyle;
91
+ this.lastPoint = other.lastPoint;
92
+ this.pointBuffer.push(...other.pointBuffer.map(point => {
93
+ return transform.transformVec2(point);
94
+ }));
95
+ }
65
96
  }
@@ -1,6 +1,6 @@
1
- import Rect2 from '../geometry/Rect2';
2
- import { Point2, Vec2 } from '../geometry/Vec2';
3
- import Viewport from '../Viewport';
1
+ import Rect2 from '../../geometry/Rect2';
2
+ import { Point2, Vec2 } from '../../geometry/Vec2';
3
+ import Viewport from '../../Viewport';
4
4
  import AbstractRenderer, { RenderingStyle } from './AbstractRenderer';
5
5
  export default class SVGRenderer extends AbstractRenderer {
6
6
  private elem;
@@ -26,4 +26,5 @@ export default class SVGRenderer extends AbstractRenderer {
26
26
  protected traceQuadraticBezierCurve(controlPoint: Point2, endPoint: Point2): void;
27
27
  drawPoints(...points: Point2[]): void;
28
28
  drawSVGElem(elem: SVGElement): void;
29
+ isTooSmallToRender(_rect: Rect2): boolean;
29
30
  }
@@ -1,5 +1,5 @@
1
- import Path, { PathCommandType } from '../geometry/Path';
2
- import { Vec2 } from '../geometry/Vec2';
1
+ import Path, { PathCommandType } from '../../geometry/Path';
2
+ import { Vec2 } from '../../geometry/Vec2';
3
3
  import AbstractRenderer from './AbstractRenderer';
4
4
  const svgNameSpace = 'http://www.w3.org/2000/svg';
5
5
  export default class SVGRenderer extends AbstractRenderer {
@@ -44,7 +44,7 @@ export default class SVGRenderer extends AbstractRenderer {
44
44
  beginPath(startPoint) {
45
45
  var _a;
46
46
  this.currentPath = [];
47
- this.pathStart = this.viewport.canvasToScreen(startPoint);
47
+ this.pathStart = this.canvasToScreen(startPoint);
48
48
  (_a = this.lastPathStart) !== null && _a !== void 0 ? _a : (this.lastPathStart = this.pathStart);
49
49
  }
50
50
  endPath(style) {
@@ -98,23 +98,23 @@ export default class SVGRenderer extends AbstractRenderer {
98
98
  this.addPathToSVG();
99
99
  }
100
100
  lineTo(point) {
101
- point = this.viewport.canvasToScreen(point);
101
+ point = this.canvasToScreen(point);
102
102
  this.currentPath.push({
103
103
  kind: PathCommandType.LineTo,
104
104
  point,
105
105
  });
106
106
  }
107
107
  moveTo(point) {
108
- point = this.viewport.canvasToScreen(point);
108
+ point = this.canvasToScreen(point);
109
109
  this.currentPath.push({
110
110
  kind: PathCommandType.MoveTo,
111
111
  point,
112
112
  });
113
113
  }
114
114
  traceCubicBezierCurve(controlPoint1, controlPoint2, endPoint) {
115
- controlPoint1 = this.viewport.canvasToScreen(controlPoint1);
116
- controlPoint2 = this.viewport.canvasToScreen(controlPoint2);
117
- endPoint = this.viewport.canvasToScreen(endPoint);
115
+ controlPoint1 = this.canvasToScreen(controlPoint1);
116
+ controlPoint2 = this.canvasToScreen(controlPoint2);
117
+ endPoint = this.canvasToScreen(endPoint);
118
118
  this.currentPath.push({
119
119
  kind: PathCommandType.CubicBezierTo,
120
120
  controlPoint1,
@@ -123,8 +123,8 @@ export default class SVGRenderer extends AbstractRenderer {
123
123
  });
124
124
  }
125
125
  traceQuadraticBezierCurve(controlPoint, endPoint) {
126
- controlPoint = this.viewport.canvasToScreen(controlPoint);
127
- endPoint = this.viewport.canvasToScreen(endPoint);
126
+ controlPoint = this.canvasToScreen(controlPoint);
127
+ endPoint = this.canvasToScreen(endPoint);
128
128
  this.currentPath.push({
129
129
  kind: PathCommandType.QuadraticBezierTo,
130
130
  controlPoint,
@@ -140,8 +140,11 @@ export default class SVGRenderer extends AbstractRenderer {
140
140
  this.mainGroup.appendChild(elem);
141
141
  });
142
142
  }
143
- // Renders a copy of the given element.
143
+ // Renders a **copy** of the given element.
144
144
  drawSVGElem(elem) {
145
145
  this.elem.appendChild(elem.cloneNode(true));
146
146
  }
147
+ isTooSmallToRender(_rect) {
148
+ return false;
149
+ }
147
150
  }
@@ -0,0 +1,3 @@
1
+ import Editor from '../Editor';
2
+ declare const _default: () => Editor;
3
+ export default _default;
@@ -0,0 +1,3 @@
1
+ import { RenderingMode } from '../rendering/Display';
2
+ import Editor from '../Editor';
3
+ export default () => new Editor(document.body, { renderingMode: RenderingMode.DummyRenderer });
@@ -7,7 +7,7 @@ import Eraser from '../tools/Eraser';
7
7
  import SelectionTool from '../tools/SelectionTool';
8
8
  import { makeFreehandLineBuilder } from '../components/builders/FreehandLineBuilder';
9
9
  import { Vec2 } from '../geometry/Vec2';
10
- import SVGRenderer from '../rendering/SVGRenderer';
10
+ import SVGRenderer from '../rendering/renderers/SVGRenderer';
11
11
  import Viewport from '../Viewport';
12
12
  import EventDispatcher from '../EventDispatcher';
13
13
  import { makeArrowBuilder } from '../components/builders/ArrowBuilder';
@@ -192,12 +192,20 @@ class SelectionWidget extends ToolbarWidget {
192
192
  fillDropdown(dropdown) {
193
193
  const container = document.createElement('div');
194
194
  const resizeButton = document.createElement('button');
195
+ const deleteButton = document.createElement('button');
195
196
  resizeButton.innerText = this.localizationTable.resizeImageToSelection;
196
197
  resizeButton.disabled = true;
198
+ deleteButton.innerText = this.localizationTable.deleteSelection;
199
+ deleteButton.disabled = true;
197
200
  resizeButton.onclick = () => {
198
201
  const selection = this.tool.getSelection();
199
202
  this.editor.dispatch(this.editor.setImportExportRect(selection.region));
200
203
  };
204
+ deleteButton.onclick = () => {
205
+ const selection = this.tool.getSelection();
206
+ this.editor.dispatch(selection.deleteSelectedObjects());
207
+ this.tool.clearSelection();
208
+ };
201
209
  // Enable/disable actions based on whether items are selected
202
210
  this.editor.notifier.on(EditorEventType.ToolUpdated, toolEvt => {
203
211
  if (toolEvt.kind !== EditorEventType.ToolUpdated) {
@@ -207,9 +215,10 @@ class SelectionWidget extends ToolbarWidget {
207
215
  const selection = this.tool.getSelection();
208
216
  const hasSelection = selection && selection.region.area > 0;
209
217
  resizeButton.disabled = !hasSelection;
218
+ deleteButton.disabled = resizeButton.disabled;
210
219
  }
211
220
  });
212
- container.replaceChildren(resizeButton);
221
+ container.replaceChildren(resizeButton, deleteButton);
213
222
  dropdown.appendChild(container);
214
223
  return true;
215
224
  }
@@ -12,6 +12,7 @@ export interface ToolbarLocalization {
12
12
  touchDrawing: string;
13
13
  thicknessLabel: string;
14
14
  resizeImageToSelection: string;
15
+ deleteSelection: string;
15
16
  undo: string;
16
17
  redo: string;
17
18
  dropdownShown: (toolName: string) => string;
@@ -6,6 +6,7 @@ export const defaultToolbarLocalization = {
6
6
  thicknessLabel: 'Thickness: ',
7
7
  colorLabel: 'Color: ',
8
8
  resizeImageToSelection: 'Resize image to selection',
9
+ deleteSelection: 'Delete selection',
9
10
  undo: 'Undo',
10
11
  redo: 'Redo',
11
12
  selectObjectType: 'Object type: ',
@@ -6,6 +6,10 @@ export default class BaseTool {
6
6
  this.enabled = true;
7
7
  this.group = null;
8
8
  }
9
+ onPointerDown(_event) { return false; }
10
+ onPointerMove(_event) { }
11
+ onPointerUp(_event) { }
12
+ onGestureCancel() { }
9
13
  onWheel(_event) {
10
14
  return false;
11
15
  }
@@ -56,6 +56,7 @@ export default class PanZoom extends BaseTool {
56
56
  }
57
57
  if (handlingGesture) {
58
58
  (_a = this.transform) !== null && _a !== void 0 ? _a : (this.transform = new Viewport.ViewportTransform(Mat33.identity));
59
+ this.editor.display.setDraftMode(true);
59
60
  }
60
61
  return handlingGesture;
61
62
  }
@@ -100,11 +101,13 @@ export default class PanZoom extends BaseTool {
100
101
  this.transform.unapply(this.editor);
101
102
  this.editor.dispatch(this.transform, false);
102
103
  }
104
+ this.editor.display.setDraftMode(false);
103
105
  this.transform = null;
104
106
  }
105
107
  onGestureCancel() {
106
108
  var _a;
107
109
  (_a = this.transform) === null || _a === void 0 ? void 0 : _a.unapply(this.editor);
110
+ this.editor.display.setDraftMode(false);
108
111
  this.transform = null;
109
112
  }
110
113
  // Applies [transformUpdate] to the editor. This stacks on top of the