js-draw 1.2.2 → 1.3.1

package/dist/mjs/components/SVGGlobalAttributesObject.d.ts

@@ -1,6 +1,6 @@
 import { LineSegment2, Mat33, Rect2 } from '@js-draw/math';
 import AbstractRenderer from '../rendering/renderers/AbstractRenderer';
-import AbstractComponent from './AbstractComponent';
+import AbstractComponent, { ComponentSizingMode } from './AbstractComponent';
 import { ImageComponentLocalization } from './localization';
 type GlobalAttrsList = Array<[string, string | null]>;
 export default class SVGGlobalAttributesObject extends AbstractComponent {
@@ -11,6 +11,7 @@ export default class SVGGlobalAttributesObject extends AbstractComponent {
     intersects(_lineSegment: LineSegment2): boolean;
     protected applyTransformation(_affineTransfm: Mat33): void;
     isSelectable(): boolean;
+    getSizingMode(): ComponentSizingMode;
     protected createClone(): SVGGlobalAttributesObject;
     description(localization: ImageComponentLocalization): string;
     protected serializeToJSON(): string | null;

package/dist/mjs/components/SVGGlobalAttributesObject.mjs

@@ -6,7 +6,7 @@
 //
 import { Rect2 } from '@js-draw/math';
 import  SVGRenderer  from '../rendering/renderers/SVGRenderer.mjs';
-import  AbstractComponent  from './AbstractComponent.mjs';
+import  AbstractComponent, { ComponentSizingMode }  from './AbstractComponent.mjs';
 const componentKind = 'svg-global-attributes';
 // Stores global SVG attributes (e.g. namespace identifiers.)
 export default class SVGGlobalAttributesObject extends AbstractComponent {
@@ -32,6 +32,12 @@ export default class SVGGlobalAttributesObject extends AbstractComponent {
     isSelectable() {
         return false;
     }
+    getSizingMode() {
+        // This component can be shown anywhere (it won't be
+        // visible to the user, it just needs to be saved with
+        // the image).
+        return ComponentSizingMode.Anywhere;
+    }
     createClone() {
         return new SVGGlobalAttributesObject(this.attrs);
     }

package/dist/mjs/components/Stroke.d.ts

@@ -48,6 +48,7 @@ export default class Stroke extends AbstractComponent implements RestyleableComp
     updateStyle(style: ComponentStyle): SerializableCommand;
     forceStyle(style: ComponentStyle, editor: Editor | null): void;
     intersects(line: LineSegment2): boolean;
+    intersectsRect(rect: Rect2): boolean;
     render(canvas: AbstractRenderer, visibleRect?: Rect2): void;
     getProportionalRenderingTime(): number;
     private bboxForPart;

package/dist/mjs/components/Stroke.mjs

@@ -122,6 +122,50 @@ export default class Stroke extends AbstractComponent {
         }
         return false;
     }
+    intersectsRect(rect) {
+        // AbstractComponent::intersectsRect can be inexact for strokes with non-zero
+        // stroke radius (has many false negatives). As such, additional checks are
+        // done here, before passing to the superclass.
+        if (!rect.intersects(this.getBBox())) {
+            return false;
+        }
+        // The following check only checks for the positive case:
+        // Sample a set of points that are known to be within each part of this
+        // stroke. For example, the points marked with an "x" below:
+        //   ___________________
+        //  /                   \
+        //  | x              x  |
+        //  \_____________      |
+        //                |  x  |
+        //                \_____/
+        //
+        // Because we don't want the following case to result in selection,
+        //   __________________
+        //  /.___.             \
+        //  || x |          x  |    <-  /* The
+        //  |·---·             |            .___.
+        //  \____________      |            |   |
+        //               |  x  |            ·---·
+        //               \_____/           denotes the input rectangle */
+        //
+        // we need to ensure that the rectangle intersects each point **and** the
+        // edge of the rectangle.
+        for (const part of this.parts) {
+            // As such, we need to shrink the input rectangle to verify that the original,
+            // unshrunken rectangle would have intersected the edge of the stroke if it
+            // intersects a point within the stroke.
+            const interiorRect = rect.grownBy(-(part.style.stroke?.width ?? 0));
+            if (interiorRect.area === 0) {
+                continue;
+            }
+            for (const point of part.path.startEndPoints()) {
+                if (interiorRect.containsPoint(point)) {
+                    return true;
+                }
+            }
+        }
+        return super.intersectsRect(rect);
+    }
     render(canvas, visibleRect) {
         canvas.startObject(this.getBBox());
         for (const part of this.parts) {

package/dist/mjs/components/UnknownSVGObject.d.ts

@@ -1,6 +1,6 @@
 import { LineSegment2, Mat33, Rect2 } from '@js-draw/math';
 import AbstractRenderer from '../rendering/renderers/AbstractRenderer';
-import AbstractComponent from './AbstractComponent';
+import AbstractComponent, { ComponentSizingMode } from './AbstractComponent';
 import { ImageComponentLocalization } from './localization';
 export default class UnknownSVGObject extends AbstractComponent {
     private svgObject;
@@ -10,6 +10,7 @@ export default class UnknownSVGObject extends AbstractComponent {
     intersects(lineSegment: LineSegment2): boolean;
     protected applyTransformation(_affineTransfm: Mat33): void;
     isSelectable(): boolean;
+    getSizingMode(): ComponentSizingMode;
     protected createClone(): AbstractComponent;
     description(localization: ImageComponentLocalization): string;
     protected serializeToJSON(): string | null;

package/dist/mjs/components/UnknownSVGObject.mjs

@@ -5,7 +5,7 @@
 //
 import { Rect2 } from '@js-draw/math';
 import  SVGRenderer  from '../rendering/renderers/SVGRenderer.mjs';
-import  AbstractComponent  from './AbstractComponent.mjs';
+import  AbstractComponent, { ComponentSizingMode }  from './AbstractComponent.mjs';
 const componentId = 'unknown-svg-object';
 export default class UnknownSVGObject extends AbstractComponent {
     constructor(svgObject) {
@@ -30,6 +30,12 @@ export default class UnknownSVGObject extends AbstractComponent {
     isSelectable() {
         return false;
     }
+    getSizingMode() {
+        // This component can be shown anywhere (it won't be
+        // visible to the user, it just needs to be saved with
+        // the image).
+        return ComponentSizingMode.Anywhere;
+    }
     createClone() {
         return new UnknownSVGObject(this.svgObject.cloneNode(true));
     }

package/dist/mjs/lib.d.ts

@@ -2,52 +2,9 @@
  * The main entrypoint for the NPM package. Everything exported by this file
  * is available through the [`js-draw` package](https://www.npmjs.com/package/js-draw).
  *
- * @example
- * ```ts,runnable
- * import { Editor, Vec3, Mat33, ToolbarWidgetTag } from 'js-draw';
+ * ## Example
  *
- * // Use the Material Icon pack.
- * import { MaterialIconProvider } from '@js-draw/material-icons';
- *
- * // Apply js-draw CSS
- * import 'js-draw/styles';
- * // If your bundler doesn't support the above, try
- * // import 'js-draw/bundledStyles';
- *
- * (async () => {
- *   const editor = new Editor(document.body, {
- *     iconProvider: new MaterialIconProvider(),
- *   });
- *   const toolbar = editor.addToolbar();
- *
- *   // Increases the minimum height of the editor
- *   editor.getRootElement().style.height = '600px';
- *
- *   // Loads from SVG data
- *   await editor.loadFromSVG(`
- *       <svg viewBox="0 0 500 500" width="500" height="500" version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
- *           <style id="js-draw-style-sheet">path{stroke-linecap:round;stroke-linejoin:round;}text{white-space:pre;}</style>
- *           <path d="M500,500L500,0L0,0L0,500L500,500" fill="#aaa" class="js-draw-image-background"></path>
- *           <text style="transform: matrix(1, 0, 0, 1, 57, 192); font-family: serif; font-size: 32px; fill: #111;">Testing...</text>
- *       </svg>
- *   `);
- *
- *   // Adding tags to a toolbar button allows different styles to be applied.
- *   // Also see addActionButton.
- *   const buttonLabels = [ ToolbarWidgetTag.Save ];
- *
- *   toolbar.addSaveButton(() => {
- *     const saveData = editor.toSVG().outerHTML;
- *
- *     // Do something with saveData
- *   });
- *
- *   toolbar.addExitButton(() => {
- *     // Save/confirm exiting here?
- *     editor.remove();
- *   });
- * })();
- * ```
+ * [[include:doc-pages/inline-examples/main-js-draw-example.md]]
  *
  * @see
  * - {@link Editor}

package/dist/mjs/lib.mjs

@@ -2,52 +2,9 @@
  * The main entrypoint for the NPM package. Everything exported by this file
  * is available through the [`js-draw` package](https://www.npmjs.com/package/js-draw).
  *
- * @example
- * ```ts,runnable
- * import { Editor, Vec3, Mat33, ToolbarWidgetTag } from 'js-draw';
+ * ## Example
  *
- * // Use the Material Icon pack.
- * import { MaterialIconProvider } from '@js-draw/material-icons';
- *
- * // Apply js-draw CSS
- * import 'js-draw/styles';
- * // If your bundler doesn't support the above, try
- * // import 'js-draw/bundledStyles';
- *
- * (async () => {
- *   const editor = new Editor(document.body, {
- *     iconProvider: new MaterialIconProvider(),
- *   });
- *   const toolbar = editor.addToolbar();
- *
- *   // Increases the minimum height of the editor
- *   editor.getRootElement().style.height = '600px';
- *
- *   // Loads from SVG data
- *   await editor.loadFromSVG(`
- *       <svg viewBox="0 0 500 500" width="500" height="500" version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
- *           <style id="js-draw-style-sheet">path{stroke-linecap:round;stroke-linejoin:round;}text{white-space:pre;}</style>
- *           <path d="M500,500L500,0L0,0L0,500L500,500" fill="#aaa" class="js-draw-image-background"></path>
- *           <text style="transform: matrix(1, 0, 0, 1, 57, 192); font-family: serif; font-size: 32px; fill: #111;">Testing...</text>
- *       </svg>
- *   `);
- *
- *   // Adding tags to a toolbar button allows different styles to be applied.
- *   // Also see addActionButton.
- *   const buttonLabels = [ ToolbarWidgetTag.Save ];
- *
- *   toolbar.addSaveButton(() => {
- *     const saveData = editor.toSVG().outerHTML;
- *
- *     // Do something with saveData
- *   });
- *
- *   toolbar.addExitButton(() => {
- *     // Save/confirm exiting here?
- *     editor.remove();
- *   });
- * })();
- * ```
+ * [[include:doc-pages/inline-examples/main-js-draw-example.md]]
  *
  * @see
  * - {@link Editor}

package/dist/mjs/rendering/RenderingStyle.d.ts

@@ -3,6 +3,7 @@ interface RenderingStyle {
     readonly fill: Color4;
     readonly stroke?: {
         readonly color: Color4;
+        /** Note: The stroke `width` is twice the stroke radius. */
         readonly width: number;
     };
 }

package/dist/mjs/rendering/renderers/AbstractRenderer.mjs

@@ -63,7 +63,7 @@ export default class AbstractRenderer {
     drawPath(path) {
         // If we're being called outside of an object,
         // we can't delay rendering
-        if (this.objectLevel === 0) {
+        if (this.objectLevel === 0 || this.currentPaths === null) {
             this.currentPaths = [path];
             this.flushPath();
             this.currentPaths = null;

package/dist/mjs/rendering/renderers/SVGRenderer.mjs

@@ -129,26 +129,18 @@ export default class SVGRenderer extends AbstractRenderer {
     }
     // Apply [elemTransform] to [elem]. Uses both a `matrix` and `.x`, `.y` properties if `setXY` is true.
     // Otherwise, just uses a `matrix`.
-    transformFrom(elemTransform, elem, inCanvasSpace = false, setXY = true) {
-        let transform = !inCanvasSpace ? this.getCanvasToScreenTransform().rightMul(elemTransform) : elemTransform;
-        const translation = transform.transformVec2(Vec2.zero);
-        if (setXY) {
-            transform = transform.rightMul(Mat33.translation(translation.times(-1)));
-        }
+    transformFrom(elemTransform, elem, inCanvasSpace = false) {
+        const transform = !inCanvasSpace ? this.getCanvasToScreenTransform().rightMul(elemTransform) : elemTransform;
         if (!transform.eq(Mat33.identity)) {
-            elem.style.transform = `matrix(
-				${transform.a1}, ${transform.b1},
-				${transform.a2}, ${transform.b2},
-				${transform.a3}, ${transform.b3}
-			)`;
+            const matrixString = transform.toCSSMatrix();
+            elem.style.transform = matrixString;
+            // Most browsers round the components of CSS transforms.
+            // Include a higher precision copy of the element's transform.
+            elem.setAttribute('data-highp-transform', matrixString);
         }
         else {
             elem.style.transform = '';
         }
-        if (setXY) {
-            elem.setAttribute('x', `${toRoundedString(translation.x)}`);
-            elem.setAttribute('y', `${toRoundedString(translation.y)}`);
-        }
     }
     drawText(text, transform, style) {
         const applyTextStyles = (elem, style) => {
@@ -184,10 +176,7 @@ export default class SVGRenderer extends AbstractRenderer {
         if (!this.textContainer) {
             const container = document.createElementNS(svgNameSpace, 'text');
             container.appendChild(document.createTextNode(text));
-            // Don't set .x/.y properties (just use .style.transform).
-            // Child nodes aren't translated by .x/.y properties, but are by .style.transform.
-            const setXY = false;
-            this.transformFrom(transform, container, true, setXY);
+            this.transformFrom(transform, container, true);
             applyTextStyles(container, style);
             this.elem.appendChild(container);
             this.objectElems?.push(container);

package/dist/mjs/rendering/renderers/SVGRenderer.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/mjs/shortcuts/KeyboardShortcutManager.d.ts

@@ -33,8 +33,8 @@ export default class KeyboardShortcutManager {
      * const shortcutId = 'io.github.personalizedrefrigerator.js-draw.select-all';
      *
      * // Associate two shortcuts with the same ID
-     * const shortcut1 = KeyboardShortcutManager.keyboardShortcutFromString('ctrlOrMeta+a');
-     * const shortcut2 = KeyboardShortcutManager.keyboardShortcutFromString('ctrlOrMeta+shift+a');
+     * const shortcut1 = KeyBinding.fromString('ctrlOrMeta+a');
+     * const shortcut2 = KeyBinding.fromString('ctrlOrMeta+shift+a');
      * KeyboardShortcutManager.registerDefaultKeyboardShortcut(
      * 	shortcutId,
      * 	[ shortcut1, shortcut2 ],

package/dist/mjs/shortcuts/KeyboardShortcutManager.mjs

@@ -54,8 +54,8 @@ class KeyboardShortcutManager {
      * const shortcutId = 'io.github.personalizedrefrigerator.js-draw.select-all';
      *
      * // Associate two shortcuts with the same ID
-     * const shortcut1 = KeyboardShortcutManager.keyboardShortcutFromString('ctrlOrMeta+a');
-     * const shortcut2 = KeyboardShortcutManager.keyboardShortcutFromString('ctrlOrMeta+shift+a');
+     * const shortcut1 = KeyBinding.fromString('ctrlOrMeta+a');
+     * const shortcut2 = KeyBinding.fromString('ctrlOrMeta+shift+a');
      * KeyboardShortcutManager.registerDefaultKeyboardShortcut(
      * 	shortcutId,
      * 	[ shortcut1, shortcut2 ],

package/dist/mjs/toolbar/localization.d.ts

@@ -44,6 +44,7 @@ export interface ToolbarLocalization {
     imageWidthOption: string;
     imageHeightOption: string;
     useGridOption: string;
+    enableAutoresizeOption: string;
     toggleOverflow: string;
     about: string;
     inputStabilization: string;

package/dist/mjs/toolbar/localization.mjs

@@ -34,6 +34,7 @@ export const defaultToolbarLocalization = {
     imageWidthOption: 'Width',
     imageHeightOption: 'Height',
     useGridOption: 'Grid',
+    enableAutoresizeOption: 'Auto-resize',
     toggleOverflow: 'More',
     about: 'About',
     inputStabilization: 'Input stabilization',

package/dist/mjs/toolbar/widgets/BaseWidget.mjs

@@ -50,6 +50,11 @@ class BaseWidget {
         this.label = document.createElement('label');
         this.button.setAttribute('role', 'button');
         this.button.tabIndex = 0;
+        // Disable the context menu. This allows long-press gestures to trigger the button's
+        // tooltip instead.
+        this.button.oncontextmenu = event => {
+            event.preventDefault();
+        };
         const toolbarShortcutHandlers = this.editor.toolController.getMatchingTools(ToolbarShortcutHandler);
         // If the onKeyPress function has been extended and the editor is configured to send keypress events to
         // toolbar widgets,

package/dist/mjs/toolbar/widgets/DocumentPropertiesWidget.mjs

@@ -94,39 +94,49 @@ class DocumentPropertiesWidget extends BaseWidget {
         const container = document.createElement('div');
         container.classList.add(`${toolbarCSSPrefix}spacedList`, `${toolbarCSSPrefix}nonbutton-controls-main-list`, `${toolbarCSSPrefix}document-properties-widget`);
         // Background color input
-        const backgroundColorRow = document.createElement('div');
-        const backgroundColorLabel = document.createElement('label');
-        backgroundColorLabel.innerText = this.localizationTable.backgroundColor;
-        const { input: colorInput, container: backgroundColorInputContainer, setValue: setBgColorInputValue } = makeColorInput(this.editor, color => {
-            if (!color.eq(this.getBackgroundColor())) {
-                this.setBackgroundColor(color);
-            }
-        });
-        colorInput.id = `${toolbarCSSPrefix}docPropertiesColorInput-${DocumentPropertiesWidget.idCounter++}`;
-        backgroundColorLabel.htmlFor = colorInput.id;
-        backgroundColorRow.replaceChildren(backgroundColorLabel, backgroundColorInputContainer);
+        const makeBackgroundColorInput = () => {
+            const backgroundColorRow = document.createElement('div');
+            const backgroundColorLabel = document.createElement('label');
+            backgroundColorLabel.innerText = this.localizationTable.backgroundColor;
+            const { input: colorInput, container: backgroundColorInputContainer, setValue: setBgColorInputValue } = makeColorInput(this.editor, color => {
+                if (!color.eq(this.getBackgroundColor())) {
+                    this.setBackgroundColor(color);
+                }
+            });
+            colorInput.id = `${toolbarCSSPrefix}docPropertiesColorInput-${DocumentPropertiesWidget.idCounter++}`;
+            backgroundColorLabel.htmlFor = colorInput.id;
+            backgroundColorRow.replaceChildren(backgroundColorLabel, backgroundColorInputContainer);
+            return { setBgColorInputValue, backgroundColorRow };
+        };
+        const { backgroundColorRow, setBgColorInputValue } = makeBackgroundColorInput();
+        const makeCheckboxRow = (labelText, onChange) => {
+            const rowContainer = document.createElement('div');
+            const labelElement = document.createElement('label');
+            const checkboxElement = document.createElement('input');
+            checkboxElement.id = `${toolbarCSSPrefix}docPropertiesCheckbox-${DocumentPropertiesWidget.idCounter++}`;
+            labelElement.htmlFor = checkboxElement.id;
+            checkboxElement.type = 'checkbox';
+            labelElement.innerText = labelText;
+            checkboxElement.oninput = () => {
+                onChange(checkboxElement.checked);
+            };
+            rowContainer.replaceChildren(labelElement, checkboxElement);
+            return { container: rowContainer, checkbox: checkboxElement };
+        };
         // Background style selector
-        const useGridRow = document.createElement('div');
-        const useGridLabel = document.createElement('label');
-        const useGridCheckbox = document.createElement('input');
-        useGridCheckbox.id = `${toolbarCSSPrefix}docPropertiesUseGridCheckbox-${DocumentPropertiesWidget.idCounter++}`;
-        useGridLabel.htmlFor = useGridCheckbox.id;
-        useGridCheckbox.type = 'checkbox';
-        useGridLabel.innerText = this.localizationTable.useGridOption;
-        useGridCheckbox.oninput = () => {
+        const { container: useGridRow, checkbox: useGridCheckbox } = makeCheckboxRow(this.localizationTable.useGridOption, (checked) => {
             const prevBackgroundType = this.getBackgroundType();
             const wasGrid = prevBackgroundType === BackgroundType.Grid;
-            if (wasGrid === useGridCheckbox.checked) {
+            if (wasGrid === checked) {
                 // Already the requested background type.
                 return;
             }
             let newBackgroundType = BackgroundType.SolidColor;
-            if (useGridCheckbox.checked) {
+            if (checked) {
                 newBackgroundType = BackgroundType.Grid;
             }
             this.editor.dispatch(this.setBackgroundType(newBackgroundType));
-        };
-        useGridRow.replaceChildren(useGridLabel, useGridCheckbox);
+        });
         // Adds a width/height input
         const addDimensionRow = (labelContent, onChange) => {
             const row = document.createElement('div');
@@ -139,15 +149,25 @@ class DocumentPropertiesWidget extends BaseWidget {
             label.htmlFor = input.id;
             input.style.flexGrow = '2';
             input.style.width = '25px';
-            row.style.display = 'flex';
             input.oninput = () => {
                 onChange(parseFloat(input.value));
             };
+            row.classList.add('js-draw-size-input-row');
             row.replaceChildren(label, input);
             return {
                 setValue: (value) => {
                     input.value = value.toString();
                 },
+                setIsAutomaticSize: (automatic) => {
+                    input.disabled = automatic;
+                    const automaticSizeClass = 'size-input-row--automatic-size';
+                    if (automatic) {
+                        row.classList.add(automaticSizeClass);
+                    }
+                    else {
+                        row.classList.remove(automaticSizeClass);
+                    }
+                },
                 element: row,
             };
         };
@@ -157,6 +177,11 @@ class DocumentPropertiesWidget extends BaseWidget {
         const imageHeightRow = addDimensionRow(this.localizationTable.imageHeightOption, (value) => {
             this.updateImportExportRectSize({ height: value });
         });
+        // The autoresize checkbox
+        const { container: auroresizeRow, checkbox: autoresizeCheckbox } = makeCheckboxRow(this.localizationTable.enableAutoresizeOption, (checked) => {
+            const image = this.editor.image;
+            this.editor.dispatch(image.setAutoresizeEnabled(checked));
+        });
         // The "About..." button
         const aboutButton = document.createElement('button');
         aboutButton.classList.add('about-button');
@@ -166,13 +191,17 @@ class DocumentPropertiesWidget extends BaseWidget {
         };
         this.updateDropdownContent = () => {
             setBgColorInputValue(this.getBackgroundColor());
+            const autoresize = this.editor.image.getAutoresizeEnabled();
             const importExportRect = this.editor.getImportExportRect();
             imageWidthRow.setValue(importExportRect.width);
             imageHeightRow.setValue(importExportRect.height);
+            autoresizeCheckbox.checked = autoresize;
+            imageWidthRow.setIsAutomaticSize(autoresize);
+            imageHeightRow.setIsAutomaticSize(autoresize);
             useGridCheckbox.checked = this.getBackgroundType() === BackgroundType.Grid;
         };
         this.updateDropdownContent();
-        container.replaceChildren(backgroundColorRow, useGridRow, imageWidthRow.element, imageHeightRow.element, aboutButton);
+        container.replaceChildren(backgroundColorRow, useGridRow, imageWidthRow.element, imageHeightRow.element, auroresizeRow, aboutButton);
         dropdown.replaceChildren(container);
         return true;
     }

package/dist/mjs/toolbar/widgets/components/makeGridSelector.mjs

@@ -68,6 +68,14 @@ labelText, defaultId, choices) => {
             }
             updateButtonCSS();
         };
+        button.onfocus = () => {
+            if (buttonContainer.querySelector(':focus-visible')) {
+                buttonContainer.classList.add('focus-visible');
+            }
+        };
+        button.onblur = () => {
+            buttonContainer.classList.remove('focus-visible');
+        };
         buttonContainer.replaceChildren(button, labelContainer);
         menuContainer.appendChild(buttonContainer);
         // Set whether the current button is checked

package/dist/mjs/tools/PanZoom.mjs

@@ -206,24 +206,26 @@ export default class PanZoom extends BaseTool {
         this.lastScreenCenter = screenCenter;
         this.lastDist = dist;
         this.transform = Viewport.transformBy(this.transform.transform.rightMul(transformUpdate));
+        return transformUpdate;
     }
     handleOneFingerMove(pointer) {
         const delta = this.getCenterDelta(pointer.screenPos);
-        this.transform = Viewport.transformBy(this.transform.transform.rightMul(Mat33.translation(delta)));
+        const transformUpdate = Mat33.translation(delta);
+        this.transform = Viewport.transformBy(this.transform.transform.rightMul(transformUpdate));
         this.updateVelocity(pointer.screenPos);
         this.lastScreenCenter = pointer.screenPos;
+        return transformUpdate;
     }
     onPointerMove({ allPointers }) {
         this.transform ??= Viewport.transformBy(Mat33.identity);
-        const lastTransform = this.transform;
+        let transformUpdate = Mat33.identity;
         if (allPointers.length === 2) {
-            this.handleTwoFingerMove(allPointers);
+            transformUpdate = this.handleTwoFingerMove(allPointers);
         }
         else if (allPointers.length === 1) {
-            this.handleOneFingerMove(allPointers[0]);
+            transformUpdate = this.handleOneFingerMove(allPointers[0]);
         }
-        lastTransform.unapply(this.editor);
-        this.transform.apply(this.editor);
+        Viewport.transformBy(transformUpdate).apply(this.editor);
         this.lastTimestamp = performance.now();
     }
     onPointerUp(event) {
@@ -303,8 +305,11 @@ export default class PanZoom extends BaseTool {
         const toCanvas = this.editor.viewport.screenToCanvasTransform;
         // Transform without including translation
         const translation = toCanvas.transformVec3(Vec3.of(-delta.x, -delta.y, 0));
-        const pinchZoomScaleFactor = 1.03;
-        const transformUpdate = Mat33.scaling2D(Math.max(0.25, Math.min(Math.pow(pinchZoomScaleFactor, -delta.z), 4)), canvasPos).rightMul(Mat33.translation(translation));
+        let pinchAmount = delta.z;
+        // Clamp the magnitude of pinchAmount
+        pinchAmount = Math.atan(pinchAmount / 2) * 2;
+        const pinchZoomScaleFactor = 1.04;
+        const transformUpdate = Mat33.scaling2D(Math.max(0.4, Math.min(Math.pow(pinchZoomScaleFactor, -pinchAmount), 4)), canvasPos).rightMul(Mat33.translation(translation));
         this.updateTransform(transformUpdate, true);
         return true;
     }

package/dist/mjs/tools/ScrollbarTool.d.ts

@@ -0,0 +1,18 @@
+import Editor from '../Editor';
+import BaseTool from './BaseTool';
+/**
+ * This tool, when enabled, renders scrollbars reflecting the current position
+ * of the view relative to the import/export area of the image.
+ *
+ * **Note**: These scrollbars are currently not draggable. This may change in
+ * a future release.
+ */
+export default class ScrollbarTool extends BaseTool {
+    private editor;
+    private scrollbarOverlay;
+    private verticalScrollbar;
+    private horizontalScrollbar;
+    constructor(editor: Editor);
+    private fadeOutTimeout;
+    private updateScrollbars;
+}