js-draw 1.6.0 → 1.6.1

package/dist/cjs/image/EditorImage.js

@@ -212,11 +212,11 @@ class EditorImage {
      * @see {@link Display.flatten}
      */
     static addElement(elem, applyByFlattening = false) {
-        return new EditorImage.AddElementCommand(elem, applyByFlattening);
+        return new _a.AddElementCommand(elem, applyByFlattening);
     }
     /** @see EditorImage.addElement */
     addElement(elem, applyByFlattening) {
-        return EditorImage.addElement(elem, applyByFlattening);
+        return _a.addElement(elem, applyByFlattening);
     }
     /**
      * @returns a `Viewport` for rendering the image when importing/exporting.
@@ -235,7 +235,7 @@ class EditorImage {
      * autoresize (if it was previously enabled).
      */
     setImportExportRect(imageRect) {
-        return EditorImage.SetImportExportRectCommand.of(this, imageRect, false);
+        return _a.SetImportExportRectCommand.of(this, imageRect, false);
     }
     getAutoresizeEnabled() {
         return this.shouldAutoresizeExportViewport;
@@ -246,7 +246,7 @@ class EditorImage {
             return Command_1.default.empty;
         }
         const newBBox = this.root.getBBox();
-        return EditorImage.SetImportExportRectCommand.of(this, newBBox, autoresize);
+        return _a.SetImportExportRectCommand.of(this, newBBox, autoresize);
     }
     setAutoresizeEnabledDirectly(shouldAutoresize) {
         if (shouldAutoresize !== this.shouldAutoresizeExportViewport) {
@@ -352,7 +352,7 @@ EditorImage.AddElementCommand = (_b = class extends SerializableCommand_1.defaul
             const id = json.elemData.id;
             const foundElem = editor.image.lookupElement(id);
             const elem = foundElem ?? AbstractComponent_1.default.deserialize(json.elemData);
-            const result = new EditorImage.AddElementCommand(elem);
+            const result = new _a.AddElementCommand(elem);
             result.serializedElem = json.elemData;
             return result;
         });
@@ -361,7 +361,7 @@ EditorImage.AddElementCommand = (_b = class extends SerializableCommand_1.defaul
 // Handles resizing the background import/export region of the image.
 EditorImage.SetImportExportRectCommand = (_c = class extends SerializableCommand_1.default {
         constructor(originalSize, originalTransform, originalAutoresize, newExportRect, newAutoresize) {
-            super(EditorImage.SetImportExportRectCommand.commandId);
+            super(_a.SetImportExportRectCommand.commandId);
             this.originalSize = originalSize;
             this.originalTransform = originalTransform;
             this.originalAutoresize = originalAutoresize;
@@ -374,7 +374,7 @@ EditorImage.SetImportExportRectCommand = (_c = class extends SerializableCommand
             const originalSize = importExportViewport.visibleRect.size;
             const originalTransform = importExportViewport.canvasToScreenTransform;
             const originalAutoresize = image.getAutoresizeEnabled();
-            return new EditorImage.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, newExportRect, newAutoresize);
+            return new _a.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, newExportRect, newAutoresize);
         }
         apply(editor) {
             editor.image.setAutoresizeEnabledDirectly(this.newAutoresize);
@@ -435,7 +435,7 @@ EditorImage.SetImportExportRectCommand = (_c = class extends SerializableCommand
             const finalRect = new math_1.Rect2(json.newRegion.x, json.newRegion.y, json.newRegion.w, json.newRegion.h);
             const autoresize = json.autoresize ?? false;
             const originalAutoresize = json.originalAutoresize ?? false;
-            return new EditorImage.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, finalRect, autoresize);
+            return new _a.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, finalRect, autoresize);
         });
     })(),
     _c);

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BaseWidget_instances, _BaseWidget_hasDropdown, _BaseWidget_disabledDueToReadOnlyEditor, _BaseWidget_tags, _BaseWidget_removeEditorListeners, _BaseWidget_addEditorListeners;
+var _BaseWidget_instances, _a, _BaseWidget_hasDropdown, _BaseWidget_disabledDueToReadOnlyEditor, _BaseWidget_tags, _BaseWidget_removeEditorListeners, _BaseWidget_addEditorListeners;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolbarWidgetTag = void 0;
 const ToolbarShortcutHandler_1 = __importDefault(require("../../tools/ToolbarShortcutHandler"));
@@ -428,13 +428,13 @@ class BaseWidget {
         }
     }
 }
-_BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_disabledDueToReadOnlyEditor = new WeakMap(), _BaseWidget_tags = new WeakMap(), _BaseWidget_removeEditorListeners = new WeakMap(), _BaseWidget_instances = new WeakSet(), _BaseWidget_addEditorListeners = function _BaseWidget_addEditorListeners() {
+_a = BaseWidget, _BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_disabledDueToReadOnlyEditor = new WeakMap(), _BaseWidget_tags = new WeakMap(), _BaseWidget_removeEditorListeners = new WeakMap(), _BaseWidget_instances = new WeakSet(), _BaseWidget_addEditorListeners = function _BaseWidget_addEditorListeners() {
     __classPrivateFieldGet(this, _BaseWidget_removeEditorListeners, "f")?.call(this);
     const toolbarShortcutHandlers = this.editor.toolController.getMatchingTools(ToolbarShortcutHandler_1.default);
     let removeKeyPressListener = null;
     // If the onKeyPress function has been extended and the editor is configured to send keypress events to
     // toolbar widgets,
-    if (toolbarShortcutHandlers.length > 0 && this.onKeyPress !== BaseWidget.prototype.onKeyPress) {
+    if (toolbarShortcutHandlers.length > 0 && this.onKeyPress !== _a.prototype.onKeyPress) {
         const keyPressListener = (event) => this.onKeyPress(event);
         const handler = toolbarShortcutHandlers[0];
         handler.registerListener(keyPressListener);

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

@@ -157,10 +157,12 @@ class Selection {
         // Reset for the next drag
         this.originalRegion = this.originalRegion.transformedBoundingBox(this.transform);
         this.transform = math_1.Mat33.identity;
-        // Make the commands undo-able, but only if the transform is non-empty.
-        if (!fullTransform.eq(math_1.Mat33.identity)) {
-            await this.editor.dispatch(new Selection.ApplyTransformationCommand(this, selectedElems, fullTransform));
-        }
+        // Make the commands undo-able.
+        // Don't check for non-empty transforms because this breaks changing the
+        // z-index of the just-transformed commands.
+        //
+        // TODO: Check whether the selectedElems are already all toplevel.
+        await this.editor.dispatch(new _a.ApplyTransformationCommand(this, selectedElems, fullTransform));
         // Clear renderings of any in-progress transformations
         const wetInkRenderer = this.editor.display.getWetInkRenderer();
         wetInkRenderer.clear();
@@ -410,7 +412,7 @@ class Selection {
         if (wasTransforming) {
             // Don't update the selection's focus when redoing/undoing
             const selectionToUpdate = null;
-            tmpApplyCommand = new Selection.ApplyTransformationCommand(selectionToUpdate, this.selectedElems, this.transform);
+            tmpApplyCommand = new _a.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

package/dist/cjs/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
-    number: '1.6.0',
+    number: '1.6.1',
 };

package/dist/mjs/image/EditorImage.mjs

@@ -182,11 +182,11 @@ class EditorImage {
      * @see {@link Display.flatten}
      */
     static addElement(elem, applyByFlattening = false) {
-        return new EditorImage.AddElementCommand(elem, applyByFlattening);
+        return new _a.AddElementCommand(elem, applyByFlattening);
     }
     /** @see EditorImage.addElement */
     addElement(elem, applyByFlattening) {
-        return EditorImage.addElement(elem, applyByFlattening);
+        return _a.addElement(elem, applyByFlattening);
     }
     /**
      * @returns a `Viewport` for rendering the image when importing/exporting.
@@ -205,7 +205,7 @@ class EditorImage {
      * autoresize (if it was previously enabled).
      */
     setImportExportRect(imageRect) {
-        return EditorImage.SetImportExportRectCommand.of(this, imageRect, false);
+        return _a.SetImportExportRectCommand.of(this, imageRect, false);
     }
     getAutoresizeEnabled() {
         return this.shouldAutoresizeExportViewport;
@@ -216,7 +216,7 @@ class EditorImage {
             return Command.empty;
         }
         const newBBox = this.root.getBBox();
-        return EditorImage.SetImportExportRectCommand.of(this, newBBox, autoresize);
+        return _a.SetImportExportRectCommand.of(this, newBBox, autoresize);
     }
     setAutoresizeEnabledDirectly(shouldAutoresize) {
         if (shouldAutoresize !== this.shouldAutoresizeExportViewport) {
@@ -322,7 +322,7 @@ EditorImage.AddElementCommand = (_b = class extends SerializableCommand {
             const id = json.elemData.id;
             const foundElem = editor.image.lookupElement(id);
             const elem = foundElem ?? AbstractComponent.deserialize(json.elemData);
-            const result = new EditorImage.AddElementCommand(elem);
+            const result = new _a.AddElementCommand(elem);
             result.serializedElem = json.elemData;
             return result;
         });
@@ -331,7 +331,7 @@ EditorImage.AddElementCommand = (_b = class extends SerializableCommand {
 // Handles resizing the background import/export region of the image.
 EditorImage.SetImportExportRectCommand = (_c = class extends SerializableCommand {
         constructor(originalSize, originalTransform, originalAutoresize, newExportRect, newAutoresize) {
-            super(EditorImage.SetImportExportRectCommand.commandId);
+            super(_a.SetImportExportRectCommand.commandId);
             this.originalSize = originalSize;
             this.originalTransform = originalTransform;
             this.originalAutoresize = originalAutoresize;
@@ -344,7 +344,7 @@ EditorImage.SetImportExportRectCommand = (_c = class extends SerializableCommand
             const originalSize = importExportViewport.visibleRect.size;
             const originalTransform = importExportViewport.canvasToScreenTransform;
             const originalAutoresize = image.getAutoresizeEnabled();
-            return new EditorImage.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, newExportRect, newAutoresize);
+            return new _a.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, newExportRect, newAutoresize);
         }
         apply(editor) {
             editor.image.setAutoresizeEnabledDirectly(this.newAutoresize);
@@ -405,7 +405,7 @@ EditorImage.SetImportExportRectCommand = (_c = class extends SerializableCommand
             const finalRect = new Rect2(json.newRegion.x, json.newRegion.y, json.newRegion.w, json.newRegion.h);
             const autoresize = json.autoresize ?? false;
             const originalAutoresize = json.originalAutoresize ?? false;
-            return new EditorImage.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, finalRect, autoresize);
+            return new _a.SetImportExportRectCommand(originalSize, originalTransform, originalAutoresize, finalRect, autoresize);
         });
     })(),
     _c);

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

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BaseWidget_instances, _BaseWidget_hasDropdown, _BaseWidget_disabledDueToReadOnlyEditor, _BaseWidget_tags, _BaseWidget_removeEditorListeners, _BaseWidget_addEditorListeners;
+var _BaseWidget_instances, _a, _BaseWidget_hasDropdown, _BaseWidget_disabledDueToReadOnlyEditor, _BaseWidget_tags, _BaseWidget_removeEditorListeners, _BaseWidget_addEditorListeners;
 import  ToolbarShortcutHandler  from '../../tools/ToolbarShortcutHandler.mjs';
 import  { keyPressEventFromHTMLEvent, keyUpEventFromHTMLEvent }  from '../../inputEvents.mjs';
 import  { toolbarCSSPrefix }  from '../constants.mjs';
@@ -422,13 +422,13 @@ class BaseWidget {
         }
     }
 }
-_BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_disabledDueToReadOnlyEditor = new WeakMap(), _BaseWidget_tags = new WeakMap(), _BaseWidget_removeEditorListeners = new WeakMap(), _BaseWidget_instances = new WeakSet(), _BaseWidget_addEditorListeners = function _BaseWidget_addEditorListeners() {
+_a = BaseWidget, _BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_disabledDueToReadOnlyEditor = new WeakMap(), _BaseWidget_tags = new WeakMap(), _BaseWidget_removeEditorListeners = new WeakMap(), _BaseWidget_instances = new WeakSet(), _BaseWidget_addEditorListeners = function _BaseWidget_addEditorListeners() {
     __classPrivateFieldGet(this, _BaseWidget_removeEditorListeners, "f")?.call(this);
     const toolbarShortcutHandlers = this.editor.toolController.getMatchingTools(ToolbarShortcutHandler);
     let removeKeyPressListener = null;
     // If the onKeyPress function has been extended and the editor is configured to send keypress events to
     // toolbar widgets,
-    if (toolbarShortcutHandlers.length > 0 && this.onKeyPress !== BaseWidget.prototype.onKeyPress) {
+    if (toolbarShortcutHandlers.length > 0 && this.onKeyPress !== _a.prototype.onKeyPress) {
         const keyPressListener = (event) => this.onKeyPress(event);
         const handler = toolbarShortcutHandlers[0];
         handler.registerListener(keyPressListener);

package/dist/mjs/tools/SelectionTool/Selection.mjs

@@ -129,10 +129,12 @@ class Selection {
         // Reset for the next drag
         this.originalRegion = this.originalRegion.transformedBoundingBox(this.transform);
         this.transform = Mat33.identity;
-        // Make the commands undo-able, but only if the transform is non-empty.
-        if (!fullTransform.eq(Mat33.identity)) {
-            await this.editor.dispatch(new Selection.ApplyTransformationCommand(this, selectedElems, fullTransform));
-        }
+        // Make the commands undo-able.
+        // Don't check for non-empty transforms because this breaks changing the
+        // z-index of the just-transformed commands.
+        //
+        // TODO: Check whether the selectedElems are already all toplevel.
+        await this.editor.dispatch(new _a.ApplyTransformationCommand(this, selectedElems, fullTransform));
         // Clear renderings of any in-progress transformations
         const wetInkRenderer = this.editor.display.getWetInkRenderer();
         wetInkRenderer.clear();
@@ -382,7 +384,7 @@ class Selection {
         if (wasTransforming) {
             // Don't update the selection's focus when redoing/undoing
             const selectionToUpdate = null;
-            tmpApplyCommand = new Selection.ApplyTransformationCommand(selectionToUpdate, this.selectedElems, this.transform);
+            tmpApplyCommand = new _a.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

package/dist/mjs/version.mjs

@@ -1,3 +1,3 @@
 export default {
-    number: '1.6.0',
+    number: '1.6.1',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-draw",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Draw pictures using a pen, touchscreen, or mouse! JS-draw is a drawing library for JavaScript and TypeScript. ",
   "types": "./dist/mjs/lib.d.ts",
   "main": "./dist/cjs/lib.js",
@@ -64,13 +64,13 @@
     "postpack": "ts-node tools/copyREADME.ts revert"
   },
   "dependencies": {
-    "@js-draw/math": "^1.6.0",
+    "@js-draw/math": "^1.6.1",
     "@melloware/coloris": "0.21.0"
   },
   "devDependencies": {
-    "@js-draw/build-tool": "^1.4.0",
-    "@types/jest": "29.5.3",
-    "@types/jsdom": "21.1.1"
+    "@js-draw/build-tool": "^1.6.1",
+    "@types/jest": "29.5.5",
+    "@types/jsdom": "21.1.3"
   },
   "bugs": {
     "url": "https://github.com/personalizedrefrigerator/js-draw/issues"
@@ -86,5 +86,5 @@
     "freehand",
     "svg"
   ],
-  "gitHead": "c2278b6819ca0e464e4e7d2c3c2045e3394b1fe8"
+  "gitHead": "00f1a0ab34de40bec100d5c18657f947895bfaed"
 }