js-draw 0.17.4 → 0.18.1

package/src/tools/SelectionTool/Selection.ts

@@ -1,607 +0,0 @@
-/**
- * @internal
- * @packageDocumentation
- */
-
-import SerializableCommand from '../../commands/SerializableCommand';
-import Editor from '../../Editor';
-import Mat33 from '../../math/Mat33';
-import Rect2 from '../../math/Rect2';
-import { Point2, Vec2 } from '../../math/Vec2';
-import Pointer from '../../Pointer';
-import SelectionHandle, { HandleShape, handleSize } from './SelectionHandle';
-import { cssPrefix } from './SelectionTool';
-import AbstractComponent from '../../components/AbstractComponent';
-import { Mat33Array } from '../../math/Mat33';
-import { EditorLocalization } from '../../localization';
-import Viewport from '../../Viewport';
-import Erase from '../../commands/Erase';
-import Duplicate from '../../commands/Duplicate';
-import Command from '../../commands/Command';
-import { DragTransformer, ResizeTransformer, RotateTransformer } from './TransformMode';
-import { ResizeMode } from './types';
-import EditorImage from '../../EditorImage';
-
-const updateChunkSize = 100;
-const maxPreviewElemCount = 500;
-
-// @internal
-export default class Selection {
-	private handles: SelectionHandle[];
-	private originalRegion: Rect2;
-
-	private transformers;
-	private transform: Mat33 = Mat33.identity;
-
-	private selectedElems: AbstractComponent[] = [];
-
-	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 = {
-			drag: new DragTransformer(editor, this),
-			resize: new ResizeTransformer(editor, this),
-			rotate: new RotateTransformer(editor, this),
-		};
-
-		this.container = document.createElement('div');
-		this.backgroundElem = document.createElement('div');
-		this.backgroundElem.classList.add(`${cssPrefix}selection-background`);
-		this.container.appendChild(this.backgroundElem);
-
-		const resizeHorizontalHandle = new SelectionHandle(
-			HandleShape.Square,
-			Vec2.of(1, 0.5),
-			this,
-			(startPoint) => this.transformers.resize.onDragStart(startPoint, ResizeMode.HorizontalOnly),
-			(currentPoint) => this.transformers.resize.onDragUpdate(currentPoint),
-			() => this.transformers.resize.onDragEnd(),
-		);
-
-		const resizeVerticalHandle = new SelectionHandle(
-			HandleShape.Square,
-			Vec2.of(0.5, 1),
-			this,
-			(startPoint) => this.transformers.resize.onDragStart(startPoint, ResizeMode.VerticalOnly),
-			(currentPoint) => this.transformers.resize.onDragUpdate(currentPoint),
-			() => this.transformers.resize.onDragEnd(),
-		);
-
-		const resizeBothHandle = new SelectionHandle(
-			HandleShape.Square,
-			Vec2.of(1, 1),
-			this,
-			(startPoint) => this.transformers.resize.onDragStart(startPoint, ResizeMode.Both),
-			(currentPoint) => this.transformers.resize.onDragUpdate(currentPoint),
-			() => this.transformers.resize.onDragEnd(),
-		);
-
-		const rotationHandle = new SelectionHandle(
-			HandleShape.Circle,
-			Vec2.of(0.5, 0),
-			this,
-			(startPoint) => this.transformers.rotate.onDragStart(startPoint),
-			(currentPoint) => this.transformers.rotate.onDragUpdate(currentPoint),
-			() => this.transformers.rotate.onDragEnd(),
-		);
-
-		this.handles = [
-			resizeBothHandle,
-			resizeHorizontalHandle,
-			resizeVerticalHandle,
-			rotationHandle,
-		];
-
-		for (const handle of this.handles) {
-			handle.addTo(this.backgroundElem);
-		}
-	}
-
-	// @internal Intended for unit tests
-	public getBackgroundElem(): HTMLElement {
-		return this.backgroundElem;
-	}
-
-	public getTransform(): Mat33 {
-		return this.transform;
-	}
-
-	public get preTransformRegion(): Rect2 {
-		return this.originalRegion;
-	}
-
-	public get region(): Rect2 {
-		// TODO: This currently assumes that the region rotates about its center.
-		// This may not be true.
-		const rotationMatrix = Mat33.zRotation(this.regionRotation, this.originalRegion.center);
-		const scaleAndTranslateMat = this.transform.rightMul(rotationMatrix.inverse());
-		return this.originalRegion.transformedBoundingBox(scaleAndTranslateMat);
-	}
-
-	/**
-	 * Computes and returns the bounding box of the selection without
-	 * any additional padding. Computes directly from the elements that are selected.
-	 * @internal
-	 */
-	public computeTightBoundingBox() {
-		const bbox = this.selectedElems.reduce((
-			accumulator: Rect2|null, elem: AbstractComponent
-		): Rect2 => {
-			return (accumulator ?? elem.getBBox()).union(elem.getBBox());
-		}, null);
-
-		return bbox ?? Rect2.empty;
-	}
-
-	public get regionRotation(): number {
-		return this.transform.transformVec3(Vec2.unitX).angle();
-	}
-
-	public get preTransformedScreenRegion(): Rect2 {
-		const toScreen = (vec: Point2) => this.editor.viewport.canvasToScreen(vec);
-		return Rect2.fromCorners(
-			toScreen(this.preTransformRegion.topLeft),
-			toScreen(this.preTransformRegion.bottomRight)
-		);
-	}
-
-	public get preTransformedScreenRegionRotation(): number {
-		return this.editor.viewport.getRotationAngle();
-	}
-
-	public get screenRegion(): Rect2 {
-		const toScreen = this.editor.viewport.canvasToScreenTransform;
-		const scaleFactor = this.editor.viewport.getScaleFactor();
-
-		const screenCenter = toScreen.transformVec2(this.region.center);
-
-		return new Rect2(
-			screenCenter.x, screenCenter.y, scaleFactor * this.region.width, scaleFactor * this.region.height
-		).translatedBy(this.region.size.times(-scaleFactor/2));
-	}
-
-	public get screenRegionRotation(): number {
-		return this.regionRotation + this.editor.viewport.getRotationAngle();
-	}
-
-	// Applies, previews, but doesn't finalize the given transformation.
-	public setTransform(transform: Mat33, preview: boolean = true) {
-		this.transform = transform;
-
-		if (preview && this.hasParent) {
-			this.scrollTo();
-			this.previewTransformCmds();
-		}
-	}
-
-	// Applies the current transformation to the selection
-	public finalizeTransform() {
-		const fullTransform = this.transform;
-		const selectedElems = this.selectedElems;
-
-		// Reset for the next drag
-		this.originalRegion = this.originalRegion.transformedBoundingBox(this.transform);
-		this.transform = Mat33.identity;
-
-		// Make the commands undo-able
-		this.editor.dispatch(new Selection.ApplyTransformationCommand(
-			this, selectedElems, fullTransform
-		));
-	}
-
-	static {
-		SerializableCommand.register('selection-tool-transform', (json: any, _editor) => {
-			// The selection box is lost when serializing/deserializing. No need to store box rotation
-			const fullTransform: Mat33 = new Mat33(...(json.transform as Mat33Array));
-			const elemIds: string[] = (json.elems as any[] ?? []);
-
-			return new this.ApplyTransformationCommand(null, elemIds, fullTransform);
-		});
-	}
-
-	private static ApplyTransformationCommand = class extends SerializableCommand {
-		private transformCommands: Command[];
-		private selectedElemIds: string[];
-
-		public constructor(
-			private selection: Selection|null,
-
-			// If a `string[]`, selectedElems is a list of element IDs.
-			selectedElems: AbstractComponent[]|string[],
-
-			// Full transformation used to transform elements.
-			private fullTransform: Mat33,
-		) {
-			super('selection-tool-transform');
-
-			const isIDList = (arr: AbstractComponent[]|string[]): arr is string[] => {
-				return typeof arr[0] === 'string';
-			};
-
-			// If a list of element IDs,
-			if (isIDList(selectedElems)) {
-				this.selectedElemIds = selectedElems as string[];
-			} else {
-				this.selectedElemIds = (selectedElems as AbstractComponent[]).map(elem => elem.getId());
-				this.transformCommands = selectedElems.map(elem => {
-					return elem.transformBy(this.fullTransform);
-				});
-			}
-		}
-
-		private resolveToElems(editor: Editor) {
-			if (this.transformCommands) {
-				return;
-			}
-
-			this.transformCommands = this.selectedElemIds.map(id => {
-				const elem = editor.image.lookupElement(id);
-
-				if (!elem) {
-					throw new Error(`Unable to find element with ID, ${id}.`);
-				}
-				
-				return elem.transformBy(this.fullTransform);
-			});
-		}
-
-		public async apply(editor: Editor) {
-			this.resolveToElems(editor);
-
-			this.selection?.setTransform(this.fullTransform, false);
-			this.selection?.updateUI();
-			await editor.asyncApplyCommands(this.transformCommands, updateChunkSize);
-			this.selection?.setTransform(Mat33.identity, false);
-			this.selection?.recomputeRegion();
-			this.selection?.updateUI();
-		}
-
-		public async unapply(editor: Editor) {
-			this.resolveToElems(editor);
-
-			this.selection?.setTransform(this.fullTransform.inverse(), false);
-			this.selection?.updateUI();
-
-			await editor.asyncUnapplyCommands(this.transformCommands, updateChunkSize, true);
-			this.selection?.setTransform(Mat33.identity);
-			this.selection?.recomputeRegion();
-			this.selection?.updateUI();
-		}
-
-		protected serializeToJSON() {
-			return {
-				elems: this.selectedElemIds,
-				transform: this.fullTransform.toArray(),
-			};
-		}
-
-		public description(_editor: Editor, localizationTable: EditorLocalization) {
-			return localizationTable.transformedElements(this.selectedElemIds.length);
-		}
-	};
-
-	// Preview the effects of the current transformation on the selection
-	private previewTransformCmds() {
-		// Don't render what we're moving if it's likely to be slow.
-		if (this.selectedElems.length > maxPreviewElemCount) {
-			this.updateUI();
-			return;
-		}
-
-		const wetInkRenderer = this.editor.display.getWetInkRenderer();
-		wetInkRenderer.clear();
-		wetInkRenderer.pushTransform(this.transform);
-
-		const viewportVisibleRect = this.editor.viewport.visibleRect;
-		const visibleRect = viewportVisibleRect.transformedBoundingBox(this.transform.inverse());
-
-		for (const elem of this.selectedElems) {
-			elem.render(wetInkRenderer, visibleRect);
-		}
-
-		wetInkRenderer.popTransform();
-
-		this.updateUI();
-	}
-
-	// Find the objects corresponding to this in the document,
-	// select them.
-	// Returns false iff nothing was selected.
-	public resolveToObjects(): boolean {
-		let singleItemSelectionMode = false;
-		this.transform = Mat33.identity;
-
-		// Grow the rectangle, if necessary
-		if (this.region.w === 0 || this.region.h === 0) {
-			const padding = this.editor.viewport.visibleRect.maxDimension / 200;
-			this.originalRegion = Rect2.bboxOf(this.region.corners, padding);
-
-			// Only select one item if the rectangle was very small.
-			singleItemSelectionMode = true;
-		}
-
-		this.selectedElems = this.editor.image.getElementsIntersectingRegion(this.region).filter(elem => {
-			return elem.intersectsRect(this.region) && elem.isSelectable();
-		});
-
-		if (singleItemSelectionMode && this.selectedElems.length > 0) {
-			this.selectedElems = [ this.selectedElems[this.selectedElems.length - 1] ];
-		}
-
-		// Find the bounding box of all selected elements.
-		if (!this.recomputeRegion()) {
-			return false;
-		}
-		this.updateUI();
-
-		return true;
-	}
-
-	// Recompute this' region from the selected elements.
-	// Returns false if the selection is empty.
-	public recomputeRegion(): boolean {
-		const newRegion = this.computeTightBoundingBox();
-
-		if (!newRegion) {
-			this.cancelSelection();
-			return false;
-		}
-
-		this.originalRegion = newRegion;
-
-		const minSize = this.getMinCanvasSize();
-		if (this.originalRegion.w < minSize || this.originalRegion.h < minSize) {
-			// Add padding
-			const padding = minSize / 2;
-			this.originalRegion = Rect2.bboxOf(
-				this.originalRegion.corners, padding
-			);
-		}
-
-		return true;
-	}
-
-	public getMinCanvasSize(): number {
-		const canvasHandleSize = handleSize / this.editor.viewport.getScaleFactor();
-		return canvasHandleSize * 2;
-	}
-
-	public getSelectedItemCount() {
-		return this.selectedElems.length;
-	}
-
-	// @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`;
-		this.backgroundElem.style.marginTop = `${this.screenRegion.topLeft.y}px`;
-
-		this.backgroundElem.style.width = `${this.screenRegion.width}px`;
-		this.backgroundElem.style.height = `${this.screenRegion.height}px`;
-
-		const rotationDeg = this.screenRegionRotation * 180 / Math.PI;
-		this.backgroundElem.style.transform = `rotate(${rotationDeg}deg)`;
-		this.backgroundElem.style.transformOrigin = 'center';
-
-		for (const handle of this.handles) {
-			handle.updatePosition();
-		}
-	}
-
-	// Maps IDs to whether we removed the component from the image
-	private removedFromImage: Record<string, boolean> = {};
-
-	// Add/remove the contents of this' seleciton from the editor.
-	// Used to prevent previewed content from looking like duplicate content
-	// while dragging.
-	//
-	// Does nothing if a large number of elements are selected (and so modifying
-	// the editor image is likely to be slow.)
-	//
-	// If removed from the image, selected elements are drawn as wet ink.
-	private addRemoveSelectionFromImage(inImage: boolean) {
-		// Don't hide elements if doing so will be slow.
-		if (!inImage && this.selectedElems.length > maxPreviewElemCount) {
-			return;
-		}
-
-		for (const elem of this.selectedElems) {
-			const parent = this.editor.image.findParent(elem);
-
-			if (!inImage && parent) {
-				this.removedFromImage[elem.getId()] = true;
-				parent.remove();
-			}
-			// If we're making things visible and the selected object wasn't previously
-			// visible,
-			else if (!parent && this.removedFromImage[elem.getId()]) {
-				EditorImage.addElement(elem).apply(this.editor);
-
-				this.removedFromImage[elem.getId()] = false;
-				delete this.removedFromImage[elem.getId()];
-			}
-		}
-
-		// Don't await queueRerender. If we're running in a test, the re-render might never
-		// happen.
-		this.editor.queueRerender().then(() => {
-			if (!inImage) {
-				this.previewTransformCmds();
-			}
-		});
-	}
-
-	private removeDeletedElemsFromSelection() {
-		// Remove any deleted elements from the selection.
-		this.selectedElems = this.selectedElems.filter(elem => {
-			const hasParent = !!this.editor.image.findParent(elem);
-
-			// If we removed the element and haven't added it back yet, don't remove it
-			// from the selection.
-			const weRemoved = this.removedFromImage[elem.getId()];
-			return hasParent || weRemoved;
-		});
-	}
-
-	private targetHandle: SelectionHandle|null = null;
-	private backgroundDragging: boolean = false;
-	public onDragStart(pointer: Pointer, target: EventTarget): boolean {
-		this.removeDeletedElemsFromSelection();
-		this.addRemoveSelectionFromImage(false);
-
-		for (const handle of this.handles) {
-			if (handle.isTarget(target)) {
-				handle.handleDragStart(pointer);
-				this.targetHandle = handle;
-				return true;
-			}
-		}
-
-		if (this.backgroundElem === target) {
-			this.backgroundDragging = true;
-			this.transformers.drag.onDragStart(pointer.canvasPos);
-			return true;
-		}
-
-		return false;
-	}
-
-	public onDragUpdate(pointer: Pointer) {
-		if (this.backgroundDragging) {
-			this.transformers.drag.onDragUpdate(pointer.canvasPos);
-		}
-
-		if (this.targetHandle) {
-			this.targetHandle.handleDragUpdate(pointer);
-		}
-	}
-
-	public onDragEnd() {
-		if (this.backgroundDragging) {
-			this.transformers.drag.onDragEnd();
-		}
-		else if (this.targetHandle) {
-			this.targetHandle.handleDragEnd();
-		}
-
-		this.addRemoveSelectionFromImage(true);
-
-		this.backgroundDragging = false;
-		this.targetHandle = null;
-		this.updateUI();
-	}
-
-	public onDragCancel() {
-		this.backgroundDragging = false;
-		this.targetHandle = null;
-		this.setTransform(Mat33.identity);
-
-		this.addRemoveSelectionFromImage(true);
-	}
-
-	// Scroll the viewport to this. Does not zoom
-	public async scrollTo() {
-		if (this.selectedElems.length === 0) {
-			return;
-		}
-
-		const screenRect = new Rect2(0, 0, this.editor.display.width, this.editor.display.height);
-		if (!screenRect.containsPoint(this.screenRegion.center)) {
-			const closestPoint = screenRect.getClosestPointOnBoundaryTo(this.screenRegion.center);
-			const screenDelta = this.screenRegion.center.minus(closestPoint);
-			const delta = this.editor.viewport.screenToCanvasTransform.transformVec3(screenDelta);
-			await this.editor.dispatchNoAnnounce(
-				Viewport.transformBy(Mat33.translation(delta.times(-1))), false
-			);
-
-			// Re-renders clear wet ink, so we need to re-draw the preview
-			// after the full re-render.
-			await this.editor.queueRerender();
-			this.previewTransformCmds();
-		}
-	}
-
-	public deleteSelectedObjects(): Command {
-		if (this.backgroundDragging || this.targetHandle) {
-			this.onDragEnd();
-		}
-
-		return new Erase(this.selectedElems);
-	}
-
-	public async duplicateSelectedObjects(): Promise<Command> {
-		const wasTransforming = this.backgroundDragging || this.targetHandle;
-		let tmpApplyCommand: Command|null = null;
-
-		if (wasTransforming) {
-			// Don't update the selection's focus when redoing/undoing
-			const selectionToUpdate: Selection|null = null;
-			tmpApplyCommand = new Selection.ApplyTransformationCommand(
-				selectionToUpdate, this.selectedElems, this.transform
-			);
-
-			// Transform to ensure that the duplicates are in the correct location
-			await tmpApplyCommand.apply(this.editor);
-
-			// Show items again
-			this.addRemoveSelectionFromImage(true);
-		}
-
-		const duplicateCommand = new Duplicate(this.selectedElems);
-
-		if (wasTransforming) {
-			// Move the selected objects back to the correct location.
-			await tmpApplyCommand?.unapply(this.editor);
-			this.addRemoveSelectionFromImage(false);
-
-			this.previewTransformCmds();
-			this.updateUI();
-		}
-
-		return duplicateCommand;
-	}
-
-	public addTo(elem: HTMLElement) {
-		if (this.container.parentElement) {
-			this.container.remove();
-		}
-
-		elem.appendChild(this.container);
-		this.hasParent = true;
-	}
-
-	public setToPoint(point: Point2) {
-		this.originalRegion = this.originalRegion.grownToPoint(point);
-		this.updateUI();
-	}
-
-	public cancelSelection() {
-		if (this.container.parentElement) {
-			this.container.remove();
-		}
-		this.originalRegion = Rect2.empty;
-		this.hasParent = false;
-	}
-
-	public setSelectedObjects(objects: AbstractComponent[], bbox: Rect2) {
-		this.addRemoveSelectionFromImage(true);
-		this.originalRegion = bbox;
-		this.selectedElems = objects.filter(object => object.isSelectable());
-		this.updateUI();
-	}
-
-	public getSelectedObjects(): AbstractComponent[] {
-		return this.selectedElems;
-	}
-}
-

package/src/tools/SelectionTool/SelectionHandle.ts

@@ -1,108 +0,0 @@
-import { assertUnreachable } from '../../util/assertions';
-import { Point2, Vec2 } from '../../math/Vec2';
-import { cssPrefix } from './SelectionTool';
-import Selection from './Selection';
-import Pointer from '../../Pointer';
-
-export enum HandleShape {
-	Circle,
-	Square,
-}
-
-export const handleSize = 30;
-
-// `startPoint` is in screen coordinates
-export type DragStartCallback = (startPoint: Point2)=>void;
-export type DragUpdateCallback = (canvasPoint: Point2)=> void;
-export type DragEndCallback = ()=> void;
-
-export default class SelectionHandle {
-	private element: HTMLElement;
-	private snapToGrid: boolean;
-
-	// Bounding box in screen coordinates.
-
-	public constructor(
-		readonly shape: HandleShape,
-		private readonly parentSide: Vec2,
-		private readonly parent: Selection,
-
-		private readonly onDragStart: DragStartCallback,
-		private readonly onDragUpdate: DragUpdateCallback,
-		private readonly onDragEnd: DragEndCallback,
-	) {
-		this.element = document.createElement('div');
-		this.element.classList.add(`${cssPrefix}handle`);
-
-		switch (shape) {
-		case HandleShape.Circle:
-			this.element.classList.add(`${cssPrefix}circle`);
-			break;
-		case HandleShape.Square:
-			this.element.classList.add(`${cssPrefix}square`);
-			break;
-		default:
-			assertUnreachable(shape);
-		}
-
-		this.updatePosition();
-	}
-
-	/**
-     * Adds this to `container`, where `conatiner` should be the background/selection
-     * element visible on the screen.
-     */
-	public addTo(container: HTMLElement) {
-		container.appendChild(this.element);
-	}
-
-	public updatePosition() {
-		const parentRect = this.parent.screenRegion;
-		const size = Vec2.of(handleSize, handleSize);
-		const topLeft = parentRect.size.scale(this.parentSide)
-			// Center
-			.minus(size.times(1/2));
-
-		// Position within the selection box.
-		this.element.style.marginLeft = `${topLeft.x}px`;
-		this.element.style.marginTop = `${topLeft.y}px`;
-		this.element.style.width = `${size.x}px`;
-		this.element.style.height = `${size.y}px`;
-	}
-
-	/**
-     * @returns `true` if the given `EventTarget` matches this.
-     */
-	public isTarget(target: EventTarget): boolean {
-		return target === this.element;
-	}
-
-	private dragLastPos: Vec2|null = null;
-	public handleDragStart(pointer: Pointer) {
-		this.onDragStart(pointer.canvasPos);
-		this.dragLastPos = pointer.canvasPos;
-	}
-
-	public handleDragUpdate(pointer: Pointer) {
-		if (!this.dragLastPos) {
-			return;
-		}
-
-		this.onDragUpdate(pointer.canvasPos);
-	}
-
-	public handleDragEnd() {
-		if (!this.dragLastPos) {
-			return;
-		}
-		this.onDragEnd();
-	}
-
-	public setSnapToGrid(snap: boolean) {
-		this.snapToGrid = snap;
-	}
-
-	public isSnappingToGrid() {
-		return this.snapToGrid;
-	}
-}