js-draw 0.25.0 → 1.0.0

package/dist/cjs/tools/ToolController.js

@@ -1,59 +1,88 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-    return to.concat(ar || Array.prototype.slice.call(from));
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("../types");
-var PanZoom_1 = require("./PanZoom");
-var Pen_1 = require("./Pen");
-var ToolEnabledGroup_1 = require("./ToolEnabledGroup");
-var Eraser_1 = require("./Eraser");
-var SelectionTool_1 = require("./SelectionTool/SelectionTool");
-var Color4_1 = require("../Color4");
-var UndoRedoShortcut_1 = require("./UndoRedoShortcut");
-var TextTool_1 = require("./TextTool");
-var PipetteTool_1 = require("./PipetteTool");
-var ToolSwitcherShortcut_1 = require("./ToolSwitcherShortcut");
-var PasteHandler_1 = require("./PasteHandler");
-var ToolbarShortcutHandler_1 = require("./ToolbarShortcutHandler");
-var PressureSensitiveFreehandLineBuilder_1 = require("../components/builders/PressureSensitiveFreehandLineBuilder");
-var FindTool_1 = require("./FindTool");
-var SelectAllShortcutHandler_1 = require("./SelectionTool/SelectAllShortcutHandler");
-var SoundUITool_1 = require("./SoundUITool");
-var ToolController = /** @class */ (function () {
+const types_1 = require("../types");
+const math_1 = require("@js-draw/math");
+const PanZoom_1 = __importStar(require("./PanZoom"));
+const Pen_1 = __importDefault(require("./Pen"));
+const ToolEnabledGroup_1 = __importDefault(require("./ToolEnabledGroup"));
+const Eraser_1 = __importDefault(require("./Eraser"));
+const SelectionTool_1 = __importDefault(require("./SelectionTool/SelectionTool"));
+const UndoRedoShortcut_1 = __importDefault(require("./UndoRedoShortcut"));
+const TextTool_1 = __importDefault(require("./TextTool"));
+const PipetteTool_1 = __importDefault(require("./PipetteTool"));
+const ToolSwitcherShortcut_1 = __importDefault(require("./ToolSwitcherShortcut"));
+const PasteHandler_1 = __importDefault(require("./PasteHandler"));
+const ToolbarShortcutHandler_1 = __importDefault(require("./ToolbarShortcutHandler"));
+const PressureSensitiveFreehandLineBuilder_1 = require("../components/builders/PressureSensitiveFreehandLineBuilder");
+const FindTool_1 = __importDefault(require("./FindTool"));
+const SelectAllShortcutHandler_1 = __importDefault(require("./SelectionTool/SelectAllShortcutHandler"));
+const SoundUITool_1 = __importDefault(require("./SoundUITool"));
+const inputEvents_1 = require("../inputEvents");
+const InputPipeline_1 = __importDefault(require("./InputFilter/InputPipeline"));
+const InputStabilizer_1 = __importDefault(require("./InputFilter/InputStabilizer"));
+class ToolController {
     /** @internal */
-    function ToolController(editor, localization) {
+    constructor(editor, localization) {
         this.activeTool = null;
-        var primaryToolGroup = new ToolEnabledGroup_1.default();
+        this.inputPipeline = new InputPipeline_1.default();
+        this.inputPipeline.setEmitListener(event => this.onEventInternal(event));
+        const primaryToolGroup = new ToolEnabledGroup_1.default();
         this.primaryToolGroup = primaryToolGroup;
-        var panZoomTool = new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.TwoFingerTouchGestures | PanZoom_1.PanZoomMode.RightClickDrags, localization.touchPanTool);
-        var keyboardPanZoomTool = new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.Keyboard, localization.keyboardPanZoom);
-        var primaryPenTool = new Pen_1.default(editor, localization.penTool(1), { color: Color4_1.default.purple, thickness: 8 });
-        var primaryTools = [
+        const panZoomTool = new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.TwoFingerTouchGestures | PanZoom_1.PanZoomMode.RightClickDrags, localization.touchPanTool);
+        const keyboardPanZoomTool = new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.Keyboard, localization.keyboardPanZoom);
+        const primaryPenTool = new Pen_1.default(editor, localization.penTool(1), { color: math_1.Color4.purple, thickness: 8 });
+        const secondaryPenTool = new Pen_1.default(editor, localization.penTool(2), { color: math_1.Color4.clay, thickness: 4 });
+        // Stabilize the secondary pen tool.
+        secondaryPenTool.setInputMapper(new InputStabilizer_1.default(editor.viewport));
+        const primaryTools = [
             // Three pens
             primaryPenTool,
-            new Pen_1.default(editor, localization.penTool(2), { color: Color4_1.default.clay, thickness: 4 }),
+            secondaryPenTool,
             // Highlighter-like pen with width=40
-            new Pen_1.default(editor, localization.penTool(3), { color: Color4_1.default.ofRGBA(1, 1, 0, 0.5), thickness: 40 }, PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder),
+            new Pen_1.default(editor, localization.penTool(3), {
+                color: math_1.Color4.ofRGBA(1, 1, 0, 0.5),
+                thickness: 40,
+                factory: PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder
+            }),
             new Eraser_1.default(editor, localization.eraserTool),
             new SelectionTool_1.default(editor, localization.selectionTool),
             new TextTool_1.default(editor, localization.textTool, localization),
             new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.SinglePointerGestures, localization.anyDevicePanning),
         ];
         // Accessibility tools
-        var soundExplorer = new SoundUITool_1.default(editor, localization.soundExplorer);
+        const soundExplorer = new SoundUITool_1.default(editor, localization.soundExplorer);
         soundExplorer.setEnabled(false);
-        this.tools = __spreadArray(__spreadArray([
+        this.tools = [
             new PipetteTool_1.default(editor, localization.pipetteTool),
             soundExplorer,
-            panZoomTool
-        ], primaryTools, true), [
+            panZoomTool,
+            ...primaryTools,
             keyboardPanZoomTool,
             new UndoRedoShortcut_1.default(editor),
             new ToolbarShortcutHandler_1.default(editor),
@@ -61,16 +90,16 @@ var ToolController = /** @class */ (function () {
             new FindTool_1.default(editor),
             new PasteHandler_1.default(editor),
             new SelectAllShortcutHandler_1.default(editor),
-        ], false);
-        primaryTools.forEach(function (tool) { return tool.setToolGroup(primaryToolGroup); });
+        ];
+        primaryTools.forEach(tool => tool.setToolGroup(primaryToolGroup));
         panZoomTool.setEnabled(true);
         primaryPenTool.setEnabled(true);
-        editor.notifier.on(types_1.EditorEventType.ToolEnabled, function (event) {
+        editor.notifier.on(types_1.EditorEventType.ToolEnabled, event => {
             if (event.kind === types_1.EditorEventType.ToolEnabled) {
                 editor.announceForAccessibility(localization.toolEnabledAnnouncement(event.tool.description));
             }
         });
-        editor.notifier.on(types_1.EditorEventType.ToolDisabled, function (event) {
+        editor.notifier.on(types_1.EditorEventType.ToolDisabled, event => {
             if (event.kind === types_1.EditorEventType.ToolDisabled) {
                 editor.announceForAccessibility(localization.toolDisabledAnnouncement(event.tool.description));
             }
@@ -78,48 +107,45 @@ var ToolController = /** @class */ (function () {
         this.activeTool = null;
     }
     // Replaces the current set of tools with `tools`. This should only be done before
-    // the creation of the app's toolbar (if using `HTMLToolbar`).
-    ToolController.prototype.setTools = function (tools, primaryToolGroup) {
+    // the creation of the app's toolbar (if using `AbstractToolbar`).
+    setTools(tools, primaryToolGroup) {
         this.tools = tools;
-        this.primaryToolGroup = primaryToolGroup !== null && primaryToolGroup !== void 0 ? primaryToolGroup : new ToolEnabledGroup_1.default();
-    };
+        this.primaryToolGroup = primaryToolGroup ?? new ToolEnabledGroup_1.default();
+    }
     // Add a tool that acts like one of the primary tools (only one primary tool can be enabled at a time).
     // This should be called before creating the app's toolbar.
-    ToolController.prototype.addPrimaryTool = function (tool) {
+    addPrimaryTool(tool) {
         tool.setToolGroup(this.primaryToolGroup);
         if (tool.isEnabled()) {
             this.primaryToolGroup.notifyEnabled(tool);
         }
         this.addTool(tool);
-    };
-    ToolController.prototype.getPrimaryTools = function () {
-        var _this = this;
-        return this.tools.filter(function (tool) {
-            return tool.getToolGroup() === _this.primaryToolGroup;
+    }
+    getPrimaryTools() {
+        return this.tools.filter(tool => {
+            return tool.getToolGroup() === this.primaryToolGroup;
         });
-    };
+    }
     // Add a tool to the end of this' tool list (the added tool receives events after tools already added to this).
     // This should be called before creating the app's toolbar.
-    ToolController.prototype.addTool = function (tool) {
+    addTool(tool) {
         this.tools.push(tool);
-    };
-    // Returns true if the event was handled
-    ToolController.prototype.dispatchInputEvent = function (event) {
-        var _a, _b;
-        var handled = false;
-        if (event.kind === types_1.InputEvtType.PointerDownEvt) {
-            var canOnlySendToActiveTool = false;
+    }
+    // @internal use `dispatchEvent` rather than calling `onEvent` directly.
+    onEventInternal(event) {
+        let handled = false;
+        if (event.kind === inputEvents_1.InputEvtType.PointerDownEvt) {
+            let canOnlySendToActiveTool = false;
             if (this.activeTool && !this.activeTool.eventCanBeDeliveredToNonActiveTool(event)) {
                 canOnlySendToActiveTool = true;
             }
-            for (var _i = 0, _c = this.tools; _i < _c.length; _i++) {
-                var tool = _c[_i];
+            for (const tool of this.tools) {
                 if (canOnlySendToActiveTool && tool !== this.activeTool) {
                     continue;
                 }
-                if (tool.isEnabled() && tool.onPointerDown(event)) {
+                if (tool.isEnabled() && tool.onEvent(event)) {
                     if (this.activeTool !== tool) {
-                        (_a = this.activeTool) === null || _a === void 0 ? void 0 : _a.onGestureCancel();
+                        this.activeTool?.onEvent({ kind: inputEvents_1.InputEvtType.GestureCancelEvt });
                     }
                     this.activeTool = tool;
                     handled = true;
@@ -127,9 +153,9 @@ var ToolController = /** @class */ (function () {
                 }
             }
         }
-        else if (event.kind === types_1.InputEvtType.PointerUpEvt) {
-            var upResult = (_b = this.activeTool) === null || _b === void 0 ? void 0 : _b.onPointerUp(event);
-            var continueHandlingEvents = upResult && event.allPointers.length > 1;
+        else if (event.kind === inputEvents_1.InputEvtType.PointerUpEvt) {
+            const upResult = this.activeTool?.onEvent(event);
+            const continueHandlingEvents = upResult && event.allPointers.length > 1;
             // Should the active tool continue handling events (without an additional pointer down?)
             if (!continueHandlingEvents) {
                 // No -- Remove the current tool
@@ -137,55 +163,53 @@ var ToolController = /** @class */ (function () {
             }
             handled = true;
         }
-        else if (event.kind === types_1.InputEvtType.PointerMoveEvt) {
+        else if (event.kind === inputEvents_1.InputEvtType.PointerMoveEvt) {
             if (this.activeTool !== null) {
-                this.activeTool.onPointerMove(event);
+                this.activeTool.onEvent(event);
                 handled = true;
             }
         }
-        else if (event.kind === types_1.InputEvtType.GestureCancelEvt) {
+        else if (event.kind === inputEvents_1.InputEvtType.GestureCancelEvt) {
             if (this.activeTool !== null) {
-                this.activeTool.onGestureCancel();
+                this.activeTool.onEvent(event);
                 this.activeTool = null;
             }
         }
         else {
-            var allCasesHandledGuard = void 0;
-            for (var _d = 0, _e = this.tools; _d < _e.length; _d++) {
-                var tool = _e[_d];
+            for (const tool of this.tools) {
                 if (!tool.isEnabled()) {
                     continue;
                 }
-                switch (event.kind) {
-                    case types_1.InputEvtType.KeyPressEvent:
-                        handled = tool.onKeyPress(event);
-                        break;
-                    case types_1.InputEvtType.KeyUpEvent:
-                        handled = tool.onKeyUp(event);
-                        break;
-                    case types_1.InputEvtType.WheelEvt:
-                        handled = tool.onWheel(event);
-                        break;
-                    case types_1.InputEvtType.CopyEvent:
-                        handled = tool.onCopy(event);
-                        break;
-                    case types_1.InputEvtType.PasteEvent:
-                        handled = tool.onPaste(event);
-                        break;
-                    default:
-                        allCasesHandledGuard = event;
-                        return allCasesHandledGuard;
-                }
+                handled = tool.onEvent(event);
                 if (handled) {
                     break;
                 }
             }
         }
         return handled;
-    };
-    ToolController.prototype.getMatchingTools = function (type) {
-        return this.tools.filter(function (tool) { return tool instanceof type; });
-    };
-    return ToolController;
-}());
+    }
+    /** Alias for {@link dispatchInputEvent}. */
+    onEvent(event) {
+        return this.dispatchInputEvent(event);
+    }
+    // Returns true if the event was handled.
+    dispatchInputEvent(event) {
+        // Feed the event through the input pipeline
+        return this.inputPipeline.onEvent(event);
+    }
+    /**
+     * Adds a new `InputMapper` to this' input pipeline.
+     *
+     * A `mapper` is really a relation that maps each event to no, one,
+     * or many other events.
+     *
+     * @see {@link InputMapper}.
+     */
+    addInputMapper(mapper) {
+        this.inputPipeline.addToTail(mapper);
+    }
+    getMatchingTools(type) {
+        return this.tools.filter(tool => tool instanceof type);
+    }
+}
 exports.default = ToolController;

package/dist/cjs/tools/ToolEnabledGroup.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // Connects a group of tools -- at most one tool in the group can be enabled.
-var ToolEnabledGroup = /** @class */ (function () {
-    function ToolEnabledGroup() {
-    }
-    ToolEnabledGroup.prototype.notifyEnabled = function (tool) {
-        var _a;
+class ToolEnabledGroup {
+    constructor() { }
+    notifyEnabled(tool) {
         if (tool !== this.activeTool) {
-            (_a = this.activeTool) === null || _a === void 0 ? void 0 : _a.setEnabled(false);
+            this.activeTool?.setEnabled(false);
             this.activeTool = tool;
         }
-    };
-    return ToolEnabledGroup;
-}());
+    }
+}
 exports.default = ToolEnabledGroup;

package/dist/cjs/tools/ToolSwitcherShortcut.d.ts

@@ -1,5 +1,5 @@
 import Editor from '../Editor';
-import { KeyPressEvent } from '../types';
+import { KeyPressEvent } from '../inputEvents';
 import BaseTool from './BaseTool';
 /**
  * Handles keyboard events used, by default, to select tools. By default,

package/dist/cjs/tools/ToolSwitcherShortcut.js

@@ -1,21 +1,9 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var BaseTool_1 = require("./BaseTool");
+const BaseTool_1 = __importDefault(require("./BaseTool"));
 /**
  * Handles keyboard events used, by default, to select tools. By default,
  * 1 maps to the first primary tool, 2 to the second primary tool, ... .
@@ -24,23 +12,20 @@ var BaseTool_1 = require("./BaseTool");
  *
  * @deprecated This may be replaced in the future.
  */
-var ToolSwitcherShortcut = /** @class */ (function (_super) {
-    __extends(ToolSwitcherShortcut, _super);
-    function ToolSwitcherShortcut(editor) {
-        var _this = _super.call(this, editor.notifier, editor.localization.changeTool) || this;
-        _this.editor = editor;
-        return _this;
+class ToolSwitcherShortcut extends BaseTool_1.default {
+    constructor(editor) {
+        super(editor.notifier, editor.localization.changeTool);
+        this.editor = editor;
     }
     // @internal
-    ToolSwitcherShortcut.prototype.onKeyPress = function (_a) {
-        var key = _a.key;
-        var toolController = this.editor.toolController;
-        var primaryTools = toolController.getPrimaryTools();
+    onKeyPress({ key }) {
+        const toolController = this.editor.toolController;
+        const primaryTools = toolController.getPrimaryTools();
         // Map keys 0-9 to primary tools.
-        var keyMatch = /^[0-9]$/.exec(key);
-        var targetTool;
+        const keyMatch = /^[0-9]$/.exec(key);
+        let targetTool;
         if (keyMatch) {
-            var targetIdx = parseInt(keyMatch[0], 10) - 1;
+            const targetIdx = parseInt(keyMatch[0], 10) - 1;
             targetTool = primaryTools[targetIdx];
         }
         if (targetTool) {
@@ -48,7 +33,6 @@ var ToolSwitcherShortcut = /** @class */ (function (_super) {
             return true;
         }
         return false;
-    };
-    return ToolSwitcherShortcut;
-}(BaseTool_1.default));
+    }
+}
 exports.default = ToolSwitcherShortcut;

package/dist/cjs/tools/ToolbarShortcutHandler.d.ts

@@ -1,5 +1,5 @@
 import Editor from '../Editor';
-import { KeyPressEvent } from '../types';
+import { KeyPressEvent } from '../inputEvents';
 import BaseTool from './BaseTool';
 type KeyPressListener = (event: KeyPressEvent) => boolean;
 export default class ToolbarShortcutHandler extends BaseTool {

package/dist/cjs/tools/ToolbarShortcutHandler.js

@@ -1,50 +1,34 @@
 "use strict";
 // Allows the toolbar to register keyboard events.
 // @packageDocumentation
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var BaseTool_1 = require("./BaseTool");
-var ToolbarShortcutHandler = /** @class */ (function (_super) {
-    __extends(ToolbarShortcutHandler, _super);
-    function ToolbarShortcutHandler(editor) {
-        var _this = _super.call(this, editor.notifier, editor.localization.changeTool) || this;
-        _this.listeners = new Set([]);
-        return _this;
+const BaseTool_1 = __importDefault(require("./BaseTool"));
+class ToolbarShortcutHandler extends BaseTool_1.default {
+    constructor(editor) {
+        super(editor.notifier, editor.localization.changeTool);
+        this.listeners = new Set([]);
     }
-    ToolbarShortcutHandler.prototype.registerListener = function (listener) {
+    registerListener(listener) {
         this.listeners.add(listener);
-    };
-    ToolbarShortcutHandler.prototype.removeListener = function (listener) {
+    }
+    removeListener(listener) {
         this.listeners.delete(listener);
-    };
-    ToolbarShortcutHandler.prototype.onKeyPress = function (event) {
+    }
+    onKeyPress(event) {
         // TypeScript seems to automatically convert for of loops into for(init;check;update)
         // loops (even with target set to es6). Thus, we cannot iterate directly through the
         // set here.
         // See https://stackoverflow.com/q/48886500
-        var listeners = Array.from(this.listeners.values());
-        for (var _i = 0, listeners_1 = listeners; _i < listeners_1.length; _i++) {
-            var listener = listeners_1[_i];
+        const listeners = Array.from(this.listeners.values());
+        for (const listener of listeners) {
             if (listener(event)) {
                 return true;
             }
         }
         return false;
-    };
-    return ToolbarShortcutHandler;
-}(BaseTool_1.default));
+    }
+}
 exports.default = ToolbarShortcutHandler;

package/dist/cjs/tools/UndoRedoShortcut.d.ts

@@ -1,5 +1,5 @@
 import Editor from '../Editor';
-import { KeyPressEvent } from '../types';
+import { KeyPressEvent } from '../inputEvents';
 import BaseTool from './BaseTool';
 export default class UndoRedoShortcut extends BaseTool {
     private editor;

package/dist/cjs/tools/UndoRedoShortcut.js

@@ -1,32 +1,18 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var BaseTool_1 = require("./BaseTool");
-var keybindings_1 = require("./keybindings");
+const BaseTool_1 = __importDefault(require("./BaseTool"));
+const keybindings_1 = require("./keybindings");
 // Handles ctrl+Z, ctrl+Shift+Z keyboard shortcuts.
-var UndoRedoShortcut = /** @class */ (function (_super) {
-    __extends(UndoRedoShortcut, _super);
-    function UndoRedoShortcut(editor) {
-        var _this = _super.call(this, editor.notifier, editor.localization.undoRedoTool) || this;
-        _this.editor = editor;
-        return _this;
+class UndoRedoShortcut extends BaseTool_1.default {
+    constructor(editor) {
+        super(editor.notifier, editor.localization.undoRedoTool);
+        this.editor = editor;
     }
     // @internal
-    UndoRedoShortcut.prototype.onKeyPress = function (event) {
+    onKeyPress(event) {
         if (this.editor.shortcuts.matchesShortcut(keybindings_1.undoKeyboardShortcutId, event)) {
             this.editor.history.undo();
             return true;
@@ -36,7 +22,6 @@ var UndoRedoShortcut = /** @class */ (function (_super) {
             return true;
         }
         return false;
-    };
-    return UndoRedoShortcut;
-}(BaseTool_1.default));
+    }
+}
 exports.default = UndoRedoShortcut;

package/dist/cjs/tools/keybindings.js

@@ -1,44 +1,47 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.duplicateSelectionShortcut = exports.selectAllKeyboardShortcut = exports.zoomOutKeyboardShortcutId = exports.zoomInKeyboardShortcutId = exports.rotateCounterClockwiseKeyboardShortcutId = exports.rotateClockwiseKeyboardShortcutId = exports.moveDownKeyboardShortcutId = exports.moveUpKeyboardShortcutId = exports.moveRightKeyboardShortcutId = exports.moveLeftKeyboardShortcutId = exports.toggleFindVisibleShortcutId = exports.lineLockKeyboardShortcutId = exports.snapToGridKeyboardShortcutId = exports.decreaseSizeKeyboardShortcutId = exports.increaseSizeKeyboardShortcutId = exports.redoKeyboardShortcutId = exports.undoKeyboardShortcutId = void 0;
-var KeyboardShortcutManager_1 = require("../shortcuts/KeyboardShortcutManager");
+const KeyboardShortcutManager_1 = __importDefault(require("../shortcuts/KeyboardShortcutManager"));
 // This file contains user-overridable tool-realted keybindings.
 // Undo/redo
 exports.undoKeyboardShortcutId = 'jsdraw.tools.undo';
 exports.redoKeyboardShortcutId = 'jsdaw.tools.redo';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.undoKeyboardShortcutId, ['ctrlOrMeta+z'], 'Undo');
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.redoKeyboardShortcutId, ['ctrlOrMeta+Z', 'ctrlOrMeta+Shift+z'], 'Redo');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.undoKeyboardShortcutId, ['CtrlOrMeta+KeyZ'], 'Undo');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.redoKeyboardShortcutId, ['CtrlOrMeta+Shift+KeyZ', 'CtrlOrMeta+KeyY'], 'Redo');
 // Pen/eraser/selection keybindings
 exports.increaseSizeKeyboardShortcutId = 'jsdraw.tools.increaseSize';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.increaseSizeKeyboardShortcutId, ['+', '='], 'Increase pen/eraser size');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.increaseSizeKeyboardShortcutId, ['Equal', 'Shift+Equal'], 'Increase pen/eraser size');
 exports.decreaseSizeKeyboardShortcutId = 'jsdraw.tools.decreaseSize';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.decreaseSizeKeyboardShortcutId, ['-', '_'], 'Decrease pen/eraser size');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.decreaseSizeKeyboardShortcutId, ['Minus', 'Shift+Minus'], 'Decrease pen/eraser size');
 exports.snapToGridKeyboardShortcutId = 'jsdraw.tools.snapToGrid';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.snapToGridKeyboardShortcutId, ['control', 'meta'], 'Snap to grid (press and hold)');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.snapToGridKeyboardShortcutId, ['Control', 'Meta'], 'Snap to grid (press and hold)');
 exports.lineLockKeyboardShortcutId = 'jsdraw.tools.lockToLine';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.lineLockKeyboardShortcutId, ['shift'], 'Snap to XY axes (press and hold)');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.lineLockKeyboardShortcutId, ['Shift'], 'Snap to XY axes (press and hold)');
 // Find tool
 exports.toggleFindVisibleShortcutId = 'js-draw.tools.FindTool.toggleVisible';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.toggleFindVisibleShortcutId, ['ctrlOrMeta+f'], 'Shows/hides the find tool');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.toggleFindVisibleShortcutId, ['CtrlOrMeta+KeyF'], 'Shows/hides the find tool');
 // Pan/zoom
 exports.moveLeftKeyboardShortcutId = 'jsdraw.tools.PanZoom.moveLeft';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveLeftKeyboardShortcutId, ['ArrowLeft', 'h', 'a'], 'Pan left');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveLeftKeyboardShortcutId, ['ArrowLeft', 'KeyH', 'KeyA'], 'Pan left');
 exports.moveRightKeyboardShortcutId = 'jsdraw.tools.PanZoom.moveRight';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveRightKeyboardShortcutId, ['ArrowRight', 'l', 'd'], 'Pan right');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveRightKeyboardShortcutId, ['ArrowRight', 'KeyL', 'KeyD'], 'Pan right');
 exports.moveUpKeyboardShortcutId = 'jsdraw.tools.PanZoom.moveUp';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveUpKeyboardShortcutId, ['ArrowUp', 'k', 'q'], 'Pan up');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveUpKeyboardShortcutId, ['ArrowUp', 'KeyK', 'KeyQ'], 'Pan up');
 exports.moveDownKeyboardShortcutId = 'jsdraw.tools.PanZoom.moveDown';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveDownKeyboardShortcutId, ['ArrowDown', 'j', 'e'], 'Pan down');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.moveDownKeyboardShortcutId, ['ArrowDown', 'KeyJ', 'KeyE'], 'Pan down');
 exports.rotateClockwiseKeyboardShortcutId = 'jsdraw.tools.PanZoom.rotateViewClockwise';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.rotateClockwiseKeyboardShortcutId, ['R'], 'Rotate viewport clockwise');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.rotateClockwiseKeyboardShortcutId, ['Shift+KeyR'], 'Rotate viewport clockwise');
 exports.rotateCounterClockwiseKeyboardShortcutId = 'jsdraw.tools.PanZoom.rotateViewCounterClockwise';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.rotateCounterClockwiseKeyboardShortcutId, ['r'], 'Rotate viewport counter-clockwise');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.rotateCounterClockwiseKeyboardShortcutId, ['KeyR'], 'Rotate viewport counter-clockwise');
 exports.zoomInKeyboardShortcutId = 'jsdraw.tools.PanZoom.zoomIn';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.zoomInKeyboardShortcutId, ['w'], 'Zoom in');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.zoomInKeyboardShortcutId, ['KeyW'], 'Zoom in');
 exports.zoomOutKeyboardShortcutId = 'jsdraw.tools.PanZoom.zoomOut';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.zoomOutKeyboardShortcutId, ['s'], 'Zoom out');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.zoomOutKeyboardShortcutId, ['KeyS'], 'Zoom out');
 // Selection
 exports.selectAllKeyboardShortcut = 'jsdraw.tools.SelectionTool.selectAll';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.selectAllKeyboardShortcut, ['ctrlOrMeta+a'], 'Select all');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.selectAllKeyboardShortcut, ['CtrlOrMeta+KeyA'], 'Select all');
 exports.duplicateSelectionShortcut = 'jsdraw.tools.SelectionTool.duplicateSelection';
-KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.duplicateSelectionShortcut, ['ctrlOrMeta+d'], 'Duplicate selection');
+KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.duplicateSelectionShortcut, ['CtrlOrMeta+KeyD'], 'Duplicate selection');