js-draw 0.20.0 → 0.22.0

package/dist/cjs/src/math/Path.js

@@ -10,6 +10,7 @@ const LineSegment2_1 = __importDefault(require("./LineSegment2"));
 const Mat33_1 = __importDefault(require("./Mat33"));
 const Rect2_1 = __importDefault(require("./Rect2"));
 const Vec2_1 = require("./Vec2");
+const Vec3_1 = __importDefault(require("./Vec3"));
 var PathCommandType;
 (function (PathCommandType) {
     PathCommandType[PathCommandType["LineTo"] = 0] = "LineTo";
@@ -17,6 +18,23 @@ var PathCommandType;
     PathCommandType[PathCommandType["CubicBezierTo"] = 2] = "CubicBezierTo";
     PathCommandType[PathCommandType["QuadraticBezierTo"] = 3] = "QuadraticBezierTo";
 })(PathCommandType = exports.PathCommandType || (exports.PathCommandType = {}));
+// Returns the bounding box of one path segment.
+const getPartBBox = (part) => {
+    let partBBox;
+    if (part instanceof LineSegment2_1.default) {
+        partBBox = part.bbox;
+    }
+    else if (part instanceof bezier_js_1.Bezier) {
+        const bbox = part.bbox();
+        const width = bbox.x.max - bbox.x.min;
+        const height = bbox.y.max - bbox.y.min;
+        partBBox = new Rect2_1.default(bbox.x.min, bbox.y.min, width, height);
+    }
+    else {
+        partBBox = new Rect2_1.default(part.x, part.y, 0, 0);
+    }
+    return partBBox;
+};
 class Path {
     constructor(startPoint, parts) {
         this.startPoint = startPoint;
@@ -32,6 +50,13 @@ class Path {
             this.bbox = this.bbox.union(Path.computeBBoxForSegment(startPoint, part));
         }
     }
+    getExactBBox() {
+        const bboxes = [];
+        for (const part of this.geometry) {
+            bboxes.push(getPartBBox(part));
+        }
+        return Rect2_1.default.union(...bboxes);
+    }
     // Lazy-loads and returns this path's geometry
     get geometry() {
         if (this.cachedGeometry) {
@@ -54,6 +79,7 @@ class Path {
                     startPoint = part.point;
                     break;
                 case PathCommandType.MoveTo:
+                    geometry.push(part.point);
                     startPoint = part.point;
                     break;
             }
@@ -109,11 +135,197 @@ class Path {
         }
         return Rect2_1.default.bboxOf(points);
     }
-    intersection(line) {
-        if (!line.bbox.intersects(this.bbox)) {
+    /**
+     * Let `S` be a closed path a distance `strokeRadius` from this path.
+     *
+     * @returns Approximate intersections of `line` with `S` using ray marching, starting from
+     * 	        both end points of `line` and each point in `additionalRaymarchStartPoints`.
+     */
+    raymarchIntersectionWith(line, strokeRadius, additionalRaymarchStartPoints = []) {
+        var _a, _b;
+        // No intersection between bounding boxes: No possible intersection
+        // of the interior.
+        if (!line.bbox.intersects(this.bbox.grownBy(strokeRadius))) {
             return [];
         }
+        const lineLength = line.length;
+        const partDistFunctionRecords = [];
+        // Determine distance functions for all parts that the given line could possibly intersect with
+        for (const part of this.geometry) {
+            const bbox = getPartBBox(part).grownBy(strokeRadius);
+            if (!bbox.intersects(line.bbox)) {
+                continue;
+            }
+            // Signed distance function
+            let partDist;
+            if (part instanceof LineSegment2_1.default) {
+                partDist = (point) => part.distance(point);
+            }
+            else if (part instanceof Vec3_1.default) {
+                partDist = (point) => part.minus(point).magnitude();
+            }
+            else {
+                partDist = (point) => {
+                    return part.project(point).d;
+                };
+            }
+            // Part signed distance function (negative result implies `point` is
+            // inside the shape).
+            const partSdf = (point) => partDist(point) - strokeRadius;
+            // If the line can't possibly intersect the part,
+            if (partSdf(line.p1) > lineLength && partSdf(line.p2) > lineLength) {
+                continue;
+            }
+            partDistFunctionRecords.push({
+                part,
+                distFn: partDist,
+                bbox,
+            });
+        }
+        // If no distance functions, there are no intersections.
+        if (partDistFunctionRecords.length === 0) {
+            return [];
+        }
+        // Returns the minimum distance to a part in this stroke, where only parts that the given
+        // line could intersect are considered.
+        const sdf = (point) => {
+            let minDist = Infinity;
+            let minDistPart = null;
+            const uncheckedDistFunctions = [];
+            // First pass: only curves for which the current point is inside
+            // the bounding box.
+            for (const distFnRecord of partDistFunctionRecords) {
+                const { part, distFn, bbox } = distFnRecord;
+                // Check later if the current point isn't in the bounding box.
+                if (!bbox.containsPoint(point)) {
+                    uncheckedDistFunctions.push(distFnRecord);
+                    continue;
+                }
+                const currentDist = distFn(point);
+                if (currentDist <= minDist) {
+                    minDist = currentDist;
+                    minDistPart = part;
+                }
+            }
+            // Second pass: Everything else
+            for (const { part, distFn, bbox } of uncheckedDistFunctions) {
+                // Skip if impossible for the distance to the target to be lesser than
+                // the current minimum.
+                if (!bbox.grownBy(minDist).containsPoint(point)) {
+                    continue;
+                }
+                const currentDist = distFn(point);
+                if (currentDist <= minDist) {
+                    minDist = currentDist;
+                    minDistPart = part;
+                }
+            }
+            return [minDistPart, minDist - strokeRadius];
+        };
+        // Raymarch:
+        const maxRaymarchSteps = 7;
+        // Start raymarching from each of these points. This allows detection of multiple
+        // intersections.
+        const startPoints = [
+            line.p1, ...additionalRaymarchStartPoints, line.p2
+        ];
+        // Converts a point ON THE LINE to a parameter
+        const pointToParameter = (point) => {
+            // Because line.direction is a unit vector, this computes the length
+            // of the projection of the vector(line.p1->point) onto line.direction.
+            //
+            // Note that this can be negative if the given point is outside of the given
+            // line segment.
+            return point.minus(line.p1).dot(line.direction);
+        };
+        // Sort start points by parameter on the line.
+        // This allows us to determine whether the current value of a parameter
+        // drops down to a value already tested.
+        startPoints.sort((a, b) => {
+            const t_a = pointToParameter(a);
+            const t_b = pointToParameter(b);
+            // Sort in increasing order
+            return t_a - t_b;
+        });
         const result = [];
+        const stoppingThreshold = strokeRadius / 1000;
+        // Returns the maximum x value explored
+        const raymarchFrom = (startPoint, 
+        // Direction to march in (multiplies line.direction)
+        directionMultiplier, 
+        // Terminate if the current point corresponds to a parameter
+        // below this.
+        minimumLineParameter) => {
+            let currentPoint = startPoint;
+            let [lastPart, lastDist] = sdf(currentPoint);
+            let lastParameter = pointToParameter(currentPoint);
+            if (lastDist > lineLength) {
+                return lastParameter;
+            }
+            const direction = line.direction.times(directionMultiplier);
+            for (let i = 0; i < maxRaymarchSteps; i++) {
+                // Step in the direction of the edge of the shape.
+                const step = lastDist;
+                currentPoint = currentPoint.plus(direction.times(step));
+                lastParameter = pointToParameter(currentPoint);
+                // If we're below the minimum parameter, stop. We've already tried
+                // this.
+                if (lastParameter <= minimumLineParameter) {
+                    return lastParameter;
+                }
+                const [currentPart, signedDist] = sdf(currentPoint);
+                // Ensure we're stepping in the correct direction.
+                // Note that because we could start with a negative distance and work towards a
+                // positive distance, we need absolute values here.
+                if (Math.abs(signedDist) > Math.abs(lastDist)) {
+                    // If not, stop.
+                    return null;
+                }
+                lastDist = signedDist;
+                lastPart = currentPart;
+                // Is the distance close enough that we can stop early?
+                if (Math.abs(lastDist) < stoppingThreshold) {
+                    break;
+                }
+            }
+            // Ensure that the point we ended with is on the line.
+            const isOnLineSegment = lastParameter >= 0 && lastParameter <= lineLength;
+            if (lastPart && isOnLineSegment && Math.abs(lastDist) < stoppingThreshold) {
+                result.push({
+                    point: currentPoint,
+                    parameterValue: NaN,
+                    curve: lastPart,
+                });
+            }
+            return lastParameter;
+        };
+        // The maximum value of the line's parameter explored so far (0 corresponds to
+        // line.p1)
+        let maxLineT = 0;
+        // Raymarch for each start point.
+        //
+        // Use a for (i from 0 to length) loop because startPoints may be added
+        // during iteration.
+        for (let i = 0; i < startPoints.length; i++) {
+            const startPoint = startPoints[i];
+            // Try raymarching in both directions.
+            maxLineT = Math.max(maxLineT, (_a = raymarchFrom(startPoint, 1, maxLineT)) !== null && _a !== void 0 ? _a : maxLineT);
+            maxLineT = Math.max(maxLineT, (_b = raymarchFrom(startPoint, -1, maxLineT)) !== null && _b !== void 0 ? _b : maxLineT);
+        }
+        return result;
+    }
+    /**
+     * Returns a list of intersections with this path. If `strokeRadius` is given,
+     * intersections are approximated with the surface `strokeRadius` away from this.
+     *
+     * If `strokeRadius > 0`, the resultant `parameterValue` has no defined value.
+     */
+    intersection(line, strokeRadius) {
+        let result = [];
+        // Is any intersection between shapes within the bounding boxes impossible?
+        if (!line.bbox.intersects(this.bbox.grownBy(strokeRadius !== null && strokeRadius !== void 0 ? strokeRadius : 0))) {
+            return [];
+        }
         for (const part of this.geometry) {
             if (part instanceof LineSegment2_1.default) {
                 const intersection = part.intersection(line);
@@ -125,7 +337,7 @@ class Path {
                     });
                 }
             }
-            else {
+            else if (part instanceof bezier_js_1.Bezier) {
                 const intersectionPoints = part.intersects(line).map(t => {
                     // We're using the .intersects(line) function, which is documented
                     // to always return numbers. However, to satisfy the type checker (and
@@ -148,6 +360,15 @@ class Path {
                 result.push(...intersectionPoints);
             }
         }
+        // If given a non-zero strokeWidth, attempt to raymarch.
+        // Even if raymarching, we need to collect starting points.
+        // We use the above-calculated intersections for this.
+        const doRaymarching = strokeRadius && strokeRadius > 1e-8;
+        if (doRaymarching) {
+            // Starting points for raymarching (in addition to the end points of the line).
+            const startPoints = result.map(intersection => intersection.point);
+            result = this.raymarchIntersectionWith(line, strokeRadius, startPoints);
+        }
         return result;
     }
     static mapPathCommand(part, mapping) {
@@ -651,5 +872,5 @@ class Path {
         return result;
     }
 }
-exports.default = Path;
 Path.empty = new Path(Vec2_1.Vec2.zero, []);
+exports.default = Path;

package/dist/cjs/src/math/Rect2.js

@@ -73,9 +73,7 @@ class Rect2 {
     }
     // Returns a new rectangle containing both [this] and [other].
     union(other) {
-        const topLeft = this.topLeft.zip(other.topLeft, Math.min);
-        const bottomRight = this.bottomRight.zip(other.bottomRight, Math.max);
-        return Rect2.fromCorners(topLeft, bottomRight);
+        return Rect2.union(this, other);
     }
     // Returns a the subdivision of this into [columns] columns
     // and [rows] rows. For example,
@@ -113,6 +111,9 @@ class Rect2 {
     }
     // Returns this grown by [margin] in both the x and y directions.
     grownBy(margin) {
+        if (margin === 0) {
+            return this;
+        }
         return new Rect2(this.x - margin, this.y - margin, this.w + margin * 2, this.h + margin * 2);
     }
     getClosestPointOnBoundaryTo(target) {
@@ -229,6 +230,6 @@ class Rect2 {
         return new Rect2(template.x, template.y, width, height);
     }
 }
-exports.default = Rect2;
 Rect2.empty = new Rect2(0, 0, 0, 0);
 Rect2.unitSquare = new Rect2(0, 0, 1, 1);
+exports.default = Rect2;

package/dist/cjs/src/math/Vec3.js

@@ -170,8 +170,8 @@ class Vec3 {
         return `Vec(${this.x}, ${this.y}, ${this.z})`;
     }
 }
-exports.default = Vec3;
 Vec3.unitX = Vec3.of(1, 0, 0);
 Vec3.unitY = Vec3.of(0, 1, 0);
 Vec3.unitZ = Vec3.of(0, 0, 1);
 Vec3.zero = Vec3.of(0, 0, 0);
+exports.default = Vec3;

package/dist/cjs/src/math/polynomial/QuadraticBezier.d.ts

@@ -21,7 +21,7 @@ export default class QuadraticBezier {
      */
     approximateDistance(point: Point2): number;
     /**
-     * @returns the exact distance from `point` to this.
+     * @returns the (more) exact distance from `point` to this.
      */
     distance(point: Point2): number;
     normal(t: number): Vec2;

package/dist/cjs/src/math/polynomial/QuadraticBezier.js

@@ -97,15 +97,14 @@ class QuadraticBezier {
         return Math.sqrt(Math.min(sqrDist1, sqrDist2, sqrDist3, sqrDist4));
     }
     /**
-     * @returns the exact distance from `point` to this.
+     * @returns the (more) exact distance from `point` to this.
      */
     distance(point) {
         if (!this.bezierJs) {
             this.bezierJs = new bezier_js_1.Bezier([this.p0.xy, this.p1.xy, this.p2.xy]);
         }
-        const proj = Vec2_1.Vec2.ofXY(this.bezierJs.project(point.xy));
-        const dist = proj.minus(point).magnitude();
-        return dist;
+        // .d: Distance
+        return this.bezierJs.project(point.xy).d;
     }
     normal(t) {
         const tangent = this.derivativeAt(t);

package/dist/cjs/src/rendering/Display.d.ts

@@ -53,7 +53,7 @@ export default class Display {
      */
     rerenderAsText(): void;
     /**
-     * Clears the drawing surfaces and otherwise prepares for a rerender.
+     * Clears the main drawing surface and otherwise prepares for a rerender.
      *
      * @returns the dry ink renderer.
      */

package/dist/cjs/src/rendering/Display.js

@@ -176,14 +176,13 @@ class Display {
         }
     }
     /**
-     * Clears the drawing surfaces and otherwise prepares for a rerender.
+     * Clears the main drawing surface and otherwise prepares for a rerender.
      *
      * @returns the dry ink renderer.
      */
     startRerender() {
         var _a;
         (_a = this.resizeSurfacesCallback) === null || _a === void 0 ? void 0 : _a.call(this);
-        this.wetInkRenderer.clear();
         this.dryInkRenderer.clear();
         return this.dryInkRenderer;
     }

package/dist/cjs/src/toolbar/HTMLToolbar.d.ts

@@ -22,6 +22,8 @@ export default class HTMLToolbar {
     private updateColoris;
     /** @internal */
     constructor(editor: Editor, parent: HTMLElement, localizationTable?: ToolbarLocalization);
+    private closeColorPickerOverlay;
+    private setupCloseColorPickerOverlay;
     setupColorPickers(): void;
     private reLayoutQueued;
     private queueReLayout;

package/dist/cjs/src/toolbar/HTMLToolbar.js

@@ -22,6 +22,7 @@ const ActionButtonWidget_1 = __importDefault(require("./widgets/ActionButtonWidg
 const InsertImageWidget_1 = __importDefault(require("./widgets/InsertImageWidget"));
 const DocumentPropertiesWidget_1 = __importDefault(require("./widgets/DocumentPropertiesWidget"));
 const OverflowWidget_1 = __importDefault(require("./widgets/OverflowWidget"));
+const Vec2_1 = require("../math/Vec2");
 exports.toolbarCSSPrefix = 'toolbar-';
 class HTMLToolbar {
     /** @internal */
@@ -36,6 +37,7 @@ class HTMLToolbar {
         // Widget to toggle overflow menu.
         this.overflowWidget = null;
         this.updateColoris = null;
+        this.closeColorPickerOverlay = null;
         this.reLayoutQueued = false;
         this.container = document.createElement('div');
         this.container.classList.add(`${exports.toolbarCSSPrefix}root`);
@@ -56,6 +58,68 @@ class HTMLToolbar {
             console.warn('ResizeObserver not supported. Toolbar will not resize.');
         }
     }
+    setupCloseColorPickerOverlay() {
+        if (this.closeColorPickerOverlay)
+            return;
+        this.closeColorPickerOverlay = document.createElement('div');
+        this.closeColorPickerOverlay.className = `${exports.toolbarCSSPrefix}closeColorPickerOverlay`;
+        this.editor.createHTMLOverlay(this.closeColorPickerOverlay);
+        // Buffer events: Send events to the editor only if the pointer has moved enough to
+        // suggest that the user is attempting to draw, rather than click to close the color picker.
+        let eventBuffer = [];
+        let gestureStartPos = null;
+        // Hide the color picker when attempting to draw on the overlay.
+        this.listeners.push(this.editor.handlePointerEventsFrom(this.closeColorPickerOverlay, (eventName, event) => {
+            var _a, _b;
+            // Position of the current event.
+            const currentPos = Vec2_1.Vec2.of(event.pageX, event.pageY);
+            // Whether to send the current event to the editor
+            let sendToEditor = true;
+            if (eventName === 'pointerdown') {
+                (0, coloris_1.close)();
+                // Buffer the event, but don't send it to the editor yet.
+                // We don't want to send single-click events, but we do want to send full strokes.
+                eventBuffer = [];
+                eventBuffer.push([eventName, event]);
+                gestureStartPos = currentPos;
+                // Capture the pointer so we receive future events even if the overlay is hidden.
+                (_a = this.closeColorPickerOverlay) === null || _a === void 0 ? void 0 : _a.setPointerCapture(event.pointerId);
+                // Don't send to the editor.
+                sendToEditor = false;
+            }
+            else if (eventName === 'pointermove') {
+                // Skip if the pointer hasn't moved enough to not be a "click".
+                const strokeStartThreshold = 10;
+                if (gestureStartPos && currentPos.minus(gestureStartPos).magnitude() < strokeStartThreshold) {
+                    eventBuffer.push([eventName, event]);
+                    sendToEditor = false;
+                }
+                else {
+                    // Send all buffered events to the editor -- start the stroke.
+                    for (const [eventName, event] of eventBuffer) {
+                        this.editor.handleHTMLPointerEvent(eventName, event);
+                    }
+                    eventBuffer = [];
+                    sendToEditor = true;
+                }
+            }
+            // Otherwise, if we received a pointerup/pointercancel without flushing all pointerevents from the
+            // buffer, the gesture wasn't recognised as a stroke. Thus, the editor isn't expecting a pointerup/
+            // pointercancel event.
+            else if ((eventName === 'pointerup' || eventName === 'pointercancel') && eventBuffer.length > 0) {
+                (_b = this.closeColorPickerOverlay) === null || _b === void 0 ? void 0 : _b.releasePointerCapture(event.pointerId);
+                eventBuffer = [];
+                // Don't send to the editor.
+                sendToEditor = false;
+            }
+            // Transfer focus to the editor to allow keyboard events to be handled.
+            if (eventName === 'pointerup') {
+                this.editor.focus();
+            }
+            // Forward all other events to the editor.
+            return sendToEditor;
+        }));
+    }
     // @internal
     setupColorPickers() {
         // Much of the setup only needs to be done once.
@@ -63,9 +127,7 @@ class HTMLToolbar {
             this.updateColoris();
             return;
         }
-        const closePickerOverlay = document.createElement('div');
-        closePickerOverlay.className = `${exports.toolbarCSSPrefix}closeColorPickerOverlay`;
-        this.editor.createHTMLOverlay(closePickerOverlay);
+        this.setupCloseColorPickerOverlay();
         const maxSwatchLen = 12;
         const swatches = [
             Color4_1.default.red.toHexString(),
@@ -110,7 +172,9 @@ class HTMLToolbar {
             }
             // Show/hide the overlay. Making the overlay visible gives users a surface to click
             // on that shows/hides the color picker.
-            closePickerOverlay.style.display = event.open ? 'block' : 'none';
+            if (this.closeColorPickerOverlay) {
+                this.closeColorPickerOverlay.style.display = event.open ? 'block' : 'none';
+            }
         }));
         // Add newly-selected colors to the swatch.
         this.listeners.push(this.editor.notifier.on(types_1.EditorEventType.ColorPickerColorSelected, event => {
@@ -372,12 +436,14 @@ class HTMLToolbar {
         this.addDefaultActionButtons();
     }
     remove() {
+        var _a;
         this.container.remove();
         this.resizeObserver.disconnect();
+        (_a = this.closeColorPickerOverlay) === null || _a === void 0 ? void 0 : _a.remove();
         for (const listener of this.listeners) {
             listener.remove();
         }
     }
 }
-exports.default = HTMLToolbar;
 HTMLToolbar.colorisStarted = false;
+exports.default = HTMLToolbar;

package/dist/cjs/src/toolbar/widgets/BaseToolWidget.d.ts

@@ -3,7 +3,6 @@ import BaseTool from '../../tools/BaseTool';
 import { ToolbarLocalization } from '../localization';
 import BaseWidget from './BaseWidget';
 export default abstract class BaseToolWidget extends BaseWidget {
-    protected editor: Editor;
     protected targetTool: BaseTool;
     constructor(editor: Editor, targetTool: BaseTool, id: string, localizationTable?: ToolbarLocalization);
     protected handleClick(): void;

package/dist/cjs/src/toolbar/widgets/BaseToolWidget.js

@@ -8,7 +8,6 @@ const BaseWidget_1 = __importDefault(require("./BaseWidget"));
 class BaseToolWidget extends BaseWidget_1.default {
     constructor(editor, targetTool, id, localizationTable) {
         super(editor, id, localizationTable);
-        this.editor = editor;
         this.targetTool = targetTool;
         editor.notifier.on(types_1.EditorEventType.ToolEnabled, toolEvt => {
             if (toolEvt.kind !== types_1.EditorEventType.ToolEnabled) {

package/dist/cjs/src/toolbar/widgets/BaseWidget.d.ts

@@ -37,6 +37,11 @@ export default abstract class BaseWidget {
     protected get hasDropdown(): boolean;
     protected addSubWidget(widget: BaseWidget): void;
     private toolbarWidgetToggleListener;
+    /**
+     * Adds this to `parent`. This can only be called once for each ToolbarWidget.
+     * Returns the element that was just added to `parent`.
+     * @internal
+     */
     addTo(parent: HTMLElement): HTMLElement;
     protected updateIcon(): void;
     setDisabled(disabled: boolean): void;

package/dist/cjs/src/toolbar/widgets/BaseWidget.js

@@ -140,14 +140,26 @@ class BaseWidget {
         const id = widget.getUniqueIdIn(this.subWidgets);
         this.subWidgets[id] = widget;
     }
-    // Adds this to [parent]. This can only be called once for each ToolbarWidget.
-    // Returns the element that was just added to `parent`.
-    // @internal
+    /**
+     * Adds this to `parent`. This can only be called once for each ToolbarWidget.
+     * Returns the element that was just added to `parent`.
+     * @internal
+     */
     addTo(parent) {
-        this.label.innerText = this.getTitle();
-        this.setupActionBtnClickListener(this.button);
+        // Update title and icon
         this.icon = null;
         this.updateIcon();
+        this.label.innerText = this.getTitle();
+        const longLabelCSSClass = 'long-label';
+        if (this.label.innerText.length > 7) {
+            this.label.classList.add(longLabelCSSClass);
+        }
+        else {
+            this.label.classList.remove(longLabelCSSClass);
+        }
+        // Click functionality
+        this.setupActionBtnClickListener(this.button);
+        // Clear anything already in this.container.
         this.container.replaceChildren();
         this.button.replaceChildren(this.icon, this.label);
         this.container.appendChild(this.button);

package/dist/cjs/src/toolbar/widgets/DocumentPropertiesWidget.js

@@ -197,5 +197,5 @@ class DocumentPropertiesWidget extends BaseWidget_1.default {
         return true;
     }
 }
-exports.default = DocumentPropertiesWidget;
 DocumentPropertiesWidget.idCounter = 0;
+exports.default = DocumentPropertiesWidget;

package/dist/cjs/src/toolbar/widgets/EraserToolWidget.js

@@ -59,5 +59,5 @@ class EraserToolWidget extends BaseToolWidget_1.default {
         }
     }
 }
-exports.default = EraserToolWidget;
 EraserToolWidget.nextThicknessInputId = 0;
+exports.default = EraserToolWidget;

package/dist/cjs/src/toolbar/widgets/InsertImageWidget.js

@@ -172,5 +172,5 @@ class InsertImageWidget extends ActionButtonWidget_1.default {
         });
     }
 }
-exports.default = InsertImageWidget;
 InsertImageWidget.nextInputId = 0;
+exports.default = InsertImageWidget;

package/dist/cjs/src/toolbar/widgets/PenToolWidget.js

@@ -222,5 +222,5 @@ class PenToolWidget extends BaseToolWidget_1.default {
         }
     }
 }
-exports.default = PenToolWidget;
 PenToolWidget.idCounter = 0;
+exports.default = PenToolWidget;

package/dist/cjs/src/toolbar/widgets/TextToolWidget.js

@@ -111,5 +111,5 @@ class TextToolWidget extends BaseToolWidget_1.default {
         super.deserializeFrom(state);
     }
 }
-exports.default = TextToolWidget;
 TextToolWidget.idCounter = 0;
+exports.default = TextToolWidget;

package/dist/cjs/src/tools/SelectionTool/Selection.js

@@ -153,6 +153,9 @@ class Selection {
         this.transform = Mat33_1.default.identity;
         // Make the commands undo-able
         this.editor.dispatch(new Selection.ApplyTransformationCommand(this, selectedElems, fullTransform));
+        // Clear renderings of any in-progress transformations
+        const wetInkRenderer = this.editor.display.getWetInkRenderer();
+        wetInkRenderer.clear();
     }
     // Preview the effects of the current transformation on the selection
     previewTransformCmds() {
@@ -406,7 +409,6 @@ class Selection {
         return this.selectedElems;
     }
 }
-exports.default = Selection;
 _a = Selection;
 (() => {
     SerializableCommand_1.default.register('selection-tool-transform', (json, _editor) => {
@@ -471,7 +473,7 @@ Selection.ApplyTransformationCommand = class extends SerializableCommand_1.defau
             (_b = this.selection) === null || _b === void 0 ? void 0 : _b.setTransform(this.fullTransform.inverse(), false);
             (_c = this.selection) === null || _c === void 0 ? void 0 : _c.updateUI();
             yield editor.asyncUnapplyCommands(this.transformCommands, updateChunkSize, true);
-            (_d = this.selection) === null || _d === void 0 ? void 0 : _d.setTransform(Mat33_1.default.identity);
+            (_d = this.selection) === null || _d === void 0 ? void 0 : _d.setTransform(Mat33_1.default.identity, false);
             (_e = this.selection) === null || _e === void 0 ? void 0 : _e.recomputeRegion();
             (_f = this.selection) === null || _f === void 0 ? void 0 : _f.updateUI();
         });
@@ -486,3 +488,4 @@ Selection.ApplyTransformationCommand = class extends SerializableCommand_1.defau
         return localizationTable.transformedElements(this.selectedElemIds.length);
     }
 };
+exports.default = Selection;

package/dist/cjs/src/tools/SelectionTool/SelectionTool.js

@@ -393,7 +393,6 @@ class SelectionTool extends BaseTool_1.default {
         this.onSelectionUpdated();
     }
 }
-exports.default = SelectionTool;
 SelectionTool.handleableKeys = [
     'a', 'h', 'ArrowLeft',
     'd', 'l', 'ArrowRight',
@@ -403,3 +402,4 @@ SelectionTool.handleableKeys = [
     'i', 'I', 'o', 'O',
     'Control', 'Meta',
 ];
+exports.default = SelectionTool;