js-draw 0.7.2 → 0.9.0

package/src/tools/Pen.ts

@@ -14,13 +14,13 @@ export interface PenStyle {
 
 export default class Pen extends BaseTool {
 	protected builder: ComponentBuilder|null = null;
-	protected builderFactory: ComponentBuilderFactory = makeFreehandLineBuilder;
 	private lastPoint: StrokeDataPoint|null = null;
 
 	public constructor(
 		private editor: Editor,
 		description: string,
 		private style: PenStyle,
+		private builderFactory: ComponentBuilderFactory = makeFreehandLineBuilder,
 	) {
 		super(editor.notifier, description);
 	}

package/src/tools/SelectionTool/Selection.ts

@@ -37,6 +37,8 @@ export default class Selection {
 	private container: HTMLElement;
 	private backgroundElem: HTMLElement;
 
+	private hasParent: boolean = true;
+
 	public constructor(startPoint: Point2, private editor: Editor) {
 		this.originalRegion = new Rect2(startPoint.x, startPoint.y, 0, 0);
 		this.transformers = {
@@ -155,7 +157,7 @@ export default class Selection {
 	public setTransform(transform: Mat33, preview: boolean = true) {
 		this.transform = transform;
 
-		if (preview) {
+		if (preview && this.hasParent) {
 			this.previewTransformCmds();
 			this.scrollTo();
 		}
@@ -329,6 +331,11 @@ export default class Selection {
 
 	// @internal
 	public updateUI() {
+		// Don't update old selections.
+		if (!this.hasParent) {
+			return;
+		}
+
 		// marginLeft, marginTop: Display relative to the top left of the selection overlay.
 		// left, top don't work for this.
 		this.backgroundElem.style.marginLeft = `${this.screenRegion.topLeft.x}px`;
@@ -428,6 +435,7 @@ export default class Selection {
 		}
 
 		elem.appendChild(this.container);
+		this.hasParent = true;
 	}
 
 	public setToPoint(point: Point2) {
@@ -440,6 +448,7 @@ export default class Selection {
 			this.container.remove();
 		}
 		this.originalRegion = Rect2.empty;
+		this.hasParent = false;
 	}
 
 	public setSelectedObjects(objects: AbstractComponent[], bbox: Rect2) {

package/src/tools/ToolController.ts

@@ -14,6 +14,7 @@ import PipetteTool from './PipetteTool';
 import ToolSwitcherShortcut from './ToolSwitcherShortcut';
 import PasteHandler from './PasteHandler';
 import ToolbarShortcutHandler from './ToolbarShortcutHandler';
+import { makePressureSensitiveFreehandLineBuilder } from '../components/builders/PressureSensitiveFreehandLineBuilder';
 
 export default class ToolController {
 	private tools: BaseTool[];
@@ -34,7 +35,7 @@ export default class ToolController {
 			new Pen(editor, localization.penTool(2), { color: Color4.clay, thickness: 4 }),
 			
 			// Highlighter-like pen with width=64
-			new Pen(editor, localization.penTool(3), { color: Color4.ofRGBA(1, 1, 0, 0.5), thickness: 64 }),
+			new Pen(editor, localization.penTool(3), { color: Color4.ofRGBA(1, 1, 0, 0.5), thickness: 64 }, makePressureSensitiveFreehandLineBuilder),
 			
 			new Eraser(editor, localization.eraserTool),
 			new SelectionTool(editor, localization.selectionTool),