js-draw 1.3.1 → 1.4.0

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

@@ -1,16 +1,33 @@
 "use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _ActionButtonWidget_autoDisableInReadOnlyEditors;
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseWidget_1 = __importDefault(require("./BaseWidget"));
 class ActionButtonWidget extends BaseWidget_1.default {
-    constructor(editor, id, makeIcon, title, clickAction, localizationTable, mustBeToplevel = false) {
+    constructor(editor, id, makeIcon, title, clickAction, localizationTable, mustBeToplevel = false, autoDisableInReadOnlyEditors = true) {
         super(editor, id, localizationTable);
         this.makeIcon = makeIcon;
         this.title = title;
         this.clickAction = clickAction;
         this.mustBeToplevel = mustBeToplevel;
+        _ActionButtonWidget_autoDisableInReadOnlyEditors.set(this, void 0);
+        __classPrivateFieldSet(this, _ActionButtonWidget_autoDisableInReadOnlyEditors, autoDisableInReadOnlyEditors, "f");
+    }
+    shouldAutoDisableInReadOnlyEditor() {
+        return __classPrivateFieldGet(this, _ActionButtonWidget_autoDisableInReadOnlyEditors, "f");
     }
     handleClick() {
         this.clickAction();
@@ -28,4 +45,5 @@ class ActionButtonWidget extends BaseWidget_1.default {
         return this.mustBeToplevel;
     }
 }
+_ActionButtonWidget_autoDisableInReadOnlyEditors = new WeakMap();
 exports.default = ActionButtonWidget;

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

@@ -6,6 +6,7 @@ import BaseWidget from './BaseWidget';
 export default abstract class BaseToolWidget extends BaseWidget {
     protected targetTool: BaseTool;
     constructor(editor: Editor, targetTool: BaseTool, id: string, localizationTable?: ToolbarLocalization);
+    protected shouldAutoDisableInReadOnlyEditor(): boolean;
     protected handleClick(): void;
     protected onKeyPress(event: KeyPressEvent): boolean;
     addTo(parent: HTMLElement): HTMLElement;

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

@@ -39,6 +39,9 @@ class BaseToolWidget extends BaseWidget_1.default {
             }
         });
     }
+    shouldAutoDisableInReadOnlyEditor() {
+        return !this.targetTool.canReceiveInputInReadOnlyEditor();
+    }
     handleClick() {
         if (this.hasDropdown) {
             if (!this.targetTool.isEnabled()) {

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

@@ -29,6 +29,11 @@ export default abstract class BaseWidget {
     private toplevel;
     protected readonly localizationTable: ToolbarLocalization;
     constructor(editor: Editor, id: string, localizationTable?: ToolbarLocalization);
+    /**
+     * Should return a constant true or false value. If true (the default),
+     * this widget must be automatically disabled when its editor is read-only.
+     */
+    protected shouldAutoDisableInReadOnlyEditor(): boolean;
     getId(): string;
     /**
      * Note: Tags should be set *before* a tool widget is added to a toolbar.

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_hasDropdown, _BaseWidget_tags;
+var _BaseWidget_hasDropdown, _BaseWidget_disabledDueToReadOnlyEditor, _BaseWidget_tags, _BaseWidget_readOnlyListener;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolbarWidgetTag = void 0;
 const ToolbarShortcutHandler_1 = __importDefault(require("../../tools/ToolbarShortcutHandler"));
@@ -36,11 +36,16 @@ class BaseWidget {
         this.id = id;
         this.dropdown = null;
         _BaseWidget_hasDropdown.set(this, void 0);
+        // True iff this widget is disabled.
         this.disabled = false;
+        // True iff this widget is currently disabled because the editor is read only
+        _BaseWidget_disabledDueToReadOnlyEditor.set(this, false);
         _BaseWidget_tags.set(this, []);
         // Maps subWidget IDs to subWidgets.
         this.subWidgets = {};
         this.toplevel = true;
+        // Listens for changes in whether the editor is read-only
+        _BaseWidget_readOnlyListener.set(this, null);
         this.localizationTable = localizationTable ?? editor.localization;
         // Default layout manager
         const defaultLayoutManager = new DropdownLayoutManager_1.default((text) => this.editor.announceForAccessibility(text), this.localizationTable);
@@ -68,6 +73,13 @@ class BaseWidget {
             toolbarShortcutHandlers[0].registerListener(event => this.onKeyPress(event));
         }
     }
+    /**
+     * Should return a constant true or false value. If true (the default),
+     * this widget must be automatically disabled when its editor is read-only.
+     */
+    shouldAutoDisableInReadOnlyEditor() {
+        return true;
+    }
     getId() {
         return this.id;
     }
@@ -262,6 +274,19 @@ class BaseWidget {
         if (this.container.parentElement) {
             this.container.remove();
         }
+        __classPrivateFieldSet(this, _BaseWidget_readOnlyListener, this.editor.isReadOnlyReactiveValue().onUpdateAndNow(readOnly => {
+            if (readOnly && this.shouldAutoDisableInReadOnlyEditor() && !this.disabled) {
+                this.setDisabled(true);
+                __classPrivateFieldSet(this, _BaseWidget_disabledDueToReadOnlyEditor, true, "f");
+                if (__classPrivateFieldGet(this, _BaseWidget_hasDropdown, "f")) {
+                    this.dropdown?.requestHide();
+                }
+            }
+            else if (!readOnly && __classPrivateFieldGet(this, _BaseWidget_disabledDueToReadOnlyEditor, "f")) {
+                __classPrivateFieldSet(this, _BaseWidget_disabledDueToReadOnlyEditor, false, "f");
+                this.setDisabled(false);
+            }
+        }), "f");
         parent.appendChild(this.container);
         return this.container;
     }
@@ -279,6 +304,8 @@ class BaseWidget {
     }
     remove() {
         this.container.remove();
+        __classPrivateFieldGet(this, _BaseWidget_readOnlyListener, "f")?.remove();
+        __classPrivateFieldSet(this, _BaseWidget_readOnlyListener, null, "f");
     }
     updateIcon() {
         let newIcon = this.createIcon();
@@ -295,6 +322,7 @@ class BaseWidget {
     }
     setDisabled(disabled) {
         this.disabled = disabled;
+        __classPrivateFieldSet(this, _BaseWidget_disabledDueToReadOnlyEditor, false, "f");
         if (this.disabled) {
             this.button.classList.add('disabled');
             this.button.setAttribute('aria-disabled', 'true');
@@ -415,5 +443,5 @@ class BaseWidget {
         }
     }
 }
-_BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_tags = new WeakMap();
+_BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_disabledDueToReadOnlyEditor = new WeakMap(), _BaseWidget_tags = new WeakMap(), _BaseWidget_readOnlyListener = new WeakMap();
 exports.default = BaseWidget;

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

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Erase_1 = __importDefault(require("../../commands/Erase"));
 const uniteCommands_1 = __importDefault(require("../../commands/uniteCommands"));
 const BackgroundComponent_1 = __importStar(require("../../components/BackgroundComponent"));
-const EditorImage_1 = require("../../EditorImage");
+const EditorImage_1 = require("../../image/EditorImage");
 const math_1 = require("@js-draw/math");
 const types_1 = require("../../types");
 const constants_1 = require("../constants");

package/dist/cjs/toolbar/widgets/HandToolWidget.d.ts

@@ -7,6 +7,7 @@ export default class HandToolWidget extends BaseToolWidget {
     protected overridePanZoomTool: PanZoom;
     private allowTogglingBaseTool;
     constructor(editor: Editor, overridePanZoomTool: PanZoom, localizationTable: ToolbarLocalization);
+    protected shouldAutoDisableInReadOnlyEditor(): boolean;
     private static getPrimaryHandTool;
     protected getTitle(): string;
     protected createIcon(): Element;

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

@@ -103,6 +103,9 @@ class HandModeWidget extends BaseWidget_1.default {
         });
         this.setSelected(false);
     }
+    shouldAutoDisableInReadOnlyEditor() {
+        return false;
+    }
     setModeFlag(enabled) {
         this.tool.setModeEnabled(this.flag, enabled);
     }
@@ -141,6 +144,9 @@ class HandToolWidget extends BaseToolWidget_1.default {
         this.addSubWidget(touchPanningWidget);
         this.addSubWidget(rotationLockWidget);
     }
+    shouldAutoDisableInReadOnlyEditor() {
+        return false;
+    }
     static getPrimaryHandTool(toolController) {
         const primaryPanZoomToolList = toolController.getPrimaryTools().filter(tool => tool instanceof PanZoom_1.default);
         const primaryPanZoomTool = primaryPanZoomToolList[0];

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ImageComponent_1 = __importDefault(require("../../components/ImageComponent"));
 const Erase_1 = __importDefault(require("../../commands/Erase"));
-const EditorImage_1 = __importDefault(require("../../EditorImage"));
+const EditorImage_1 = __importDefault(require("../../image/EditorImage"));
 const uniteCommands_1 = __importDefault(require("../../commands/uniteCommands"));
 const SelectionTool_1 = __importDefault(require("../../tools/SelectionTool/SelectionTool"));
 const math_1 = require("@js-draw/math");

package/dist/cjs/toolbar/widgets/OverflowWidget.d.ts

@@ -5,6 +5,7 @@ export default class OverflowWidget extends BaseWidget {
     private overflowChildren;
     private overflowContainer;
     constructor(editor: Editor, localizationTable?: ToolbarLocalization);
+    protected shouldAutoDisableInReadOnlyEditor(): boolean;
     protected getTitle(): string;
     protected createIcon(): Element | null;
     protected handleClick(): void;

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

@@ -13,6 +13,9 @@ class OverflowWidget extends BaseWidget_1.default {
         this.container.classList.add('dropdownShowable');
         this.overflowContainer ??= document.createElement('div');
     }
+    shouldAutoDisableInReadOnlyEditor() {
+        return false;
+    }
     getTitle() {
         return this.localizationTable.toggleOverflow;
     }

package/dist/cjs/toolbar/widgets/SaveActionWidget.d.ts

@@ -4,6 +4,7 @@ import { ToolbarLocalization } from '../localization';
 import ActionButtonWidget from './ActionButtonWidget';
 declare class SaveActionWidget extends ActionButtonWidget {
     constructor(editor: Editor, localization: ToolbarLocalization, saveCallback: () => void);
+    protected shouldAutoDisableInReadOnlyEditor(): boolean;
     protected onKeyPress(event: KeyPressEvent): boolean;
     mustBeInToplevelMenu(): boolean;
 }

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

@@ -11,6 +11,9 @@ class SaveActionWidget extends ActionButtonWidget_1.default {
         super(editor, 'save-button', editor.icons.makeSaveIcon, localization.save, saveCallback);
         this.setTags([BaseWidget_1.ToolbarWidgetTag.Save]);
     }
+    shouldAutoDisableInReadOnlyEditor() {
+        return false;
+    }
     onKeyPress(event) {
         if (this.editor.shortcuts.matchesShortcut(keybindings_1.saveKeyboardShortcut, event)) {
             this.clickAction();

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

@@ -8,6 +8,8 @@ export default abstract class BaseTool implements InputEventListener {
     private notifier;
     readonly description: string;
     protected constructor(notifier: EditorNotifier, description: string);
+    /** Override this to allow this tool to be enabled in a read-only editor */
+    canReceiveInputInReadOnlyEditor(): boolean;
     setInputMapper(mapper: InputMapper | null): void;
     getInputMapper(): InputMapper | null;
     private dispatchEventToCallback;
@@ -54,4 +56,5 @@ export default abstract class BaseTool implements InputEventListener {
     enabledValue(): ReactiveValue<boolean>;
     setToolGroup(group: ToolEnabledGroup): void;
     getToolGroup(): ToolEnabledGroup | null;
+    onDestroy(): void;
 }

package/dist/cjs/tools/BaseTool.js

@@ -10,7 +10,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 _BaseTool_enabled, _BaseTool_group, _BaseTool_inputMapper;
+var _BaseTool_enabled, _BaseTool_group, _BaseTool_inputMapper, _BaseTool_readOnlyEditorChangeListener;
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../types");
 const inputEvents_1 = require("../inputEvents");
@@ -22,6 +22,7 @@ class BaseTool {
         _BaseTool_enabled.set(this, void 0);
         _BaseTool_group.set(this, null);
         _BaseTool_inputMapper.set(this, null);
+        _BaseTool_readOnlyEditorChangeListener.set(this, null);
         __classPrivateFieldSet(this, _BaseTool_enabled, ReactiveValue_1.ReactiveValue.fromInitialValue(true), "f");
         __classPrivateFieldGet(this, _BaseTool_enabled, "f").onUpdate(enabled => {
             // Ensure that at most one tool in the group is enabled.
@@ -40,6 +41,10 @@ class BaseTool {
             }
         });
     }
+    /** Override this to allow this tool to be enabled in a read-only editor */
+    canReceiveInputInReadOnlyEditor() {
+        return false;
+    }
     setInputMapper(mapper) {
         __classPrivateFieldSet(this, _BaseTool_inputMapper, mapper, "f");
         if (mapper) {
@@ -157,6 +162,12 @@ class BaseTool {
         }
         return null;
     }
+    // Called when the tool is removed/when the editor is destroyed.
+    // Subclasses that override this method **must call super.onDestroy()**.
+    onDestroy() {
+        __classPrivateFieldGet(this, _BaseTool_readOnlyEditorChangeListener, "f")?.remove();
+        __classPrivateFieldSet(this, _BaseTool_readOnlyEditorChangeListener, null, "f");
+    }
 }
-_BaseTool_enabled = new WeakMap(), _BaseTool_group = new WeakMap(), _BaseTool_inputMapper = new WeakMap();
+_BaseTool_enabled = new WeakMap(), _BaseTool_group = new WeakMap(), _BaseTool_inputMapper = new WeakMap(), _BaseTool_readOnlyEditorChangeListener = new WeakMap();
 exports.default = BaseTool;

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

@@ -7,6 +7,7 @@ export default class FindTool extends BaseTool {
     private searchInput;
     private currentMatchIdx;
     constructor(editor: Editor);
+    canReceiveInputInReadOnlyEditor(): boolean;
     private getMatches;
     private focusCurrentMatch;
     private toNextMatch;

package/dist/cjs/tools/FindTool.js

@@ -21,6 +21,9 @@ class FindTool extends BaseTool_1.default {
         this.overlay.style.display = 'none';
         this.overlay.classList.add(`${cssPrefix}-overlay`);
     }
+    canReceiveInputInReadOnlyEditor() {
+        return true;
+    }
     getMatches(searchFor) {
         searchFor = searchFor.toLocaleLowerCase();
         const allTextComponents = this.editor.image.getAllElements()
@@ -113,7 +116,7 @@ class FindTool extends BaseTool_1.default {
     }
     setEnabled(enabled) {
         super.setEnabled(enabled);
-        if (enabled) {
+        if (this.isEnabled()) {
             this.setVisible(false);
         }
     }

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

@@ -32,6 +32,7 @@ export default class PanZoom extends BaseTool {
     private inertialScroller;
     private velocity;
     constructor(editor: Editor, mode: PanZoomMode, description: string);
+    canReceiveInputInReadOnlyEditor(): boolean;
     computePinchData(p1: Pointer, p2: Pointer): PinchData;
     private allPointersAreOfType;
     onPointerDown({ allPointers: pointers, current: currentPointer }: PointerEvt): boolean;

package/dist/cjs/tools/PanZoom.js

@@ -80,6 +80,10 @@ class PanZoom extends BaseTool_1.default {
         this.inertialScroller = null;
         this.velocity = null;
     }
+    // The pan/zoom tool can be used in a read-only editor.
+    canReceiveInputInReadOnlyEditor() {
+        return true;
+    }
     // Returns information about the pointers in a gesture
     computePinchData(p1, p2) {
         // Swap the pointers to ensure consistent ordering.

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

@@ -40,6 +40,5 @@ export default class Pen extends BaseTool {
     getColor(): Color4;
     getStrokeFactory(): ComponentBuilderFactory;
     getStyleValue(): MutableReactiveValue<PenStyle>;
-    setEnabled(enabled: boolean): void;
     onKeyPress(event: KeyPressEvent): boolean;
 }

package/dist/cjs/tools/Pen.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const math_1 = require("@js-draw/math");
-const EditorImage_1 = __importDefault(require("../EditorImage"));
+const EditorImage_1 = __importDefault(require("../image/EditorImage"));
 const Pointer_1 = require("../Pointer");
 const FreehandLineBuilder_1 = require("../components/builders/FreehandLineBuilder");
 const types_1 = require("../types");
@@ -205,9 +205,6 @@ class Pen extends BaseTool_1.default {
     getColor() { return this.style.color; }
     getStrokeFactory() { return this.style.factory; }
     getStyleValue() { return this.styleValue; }
-    setEnabled(enabled) {
-        super.setEnabled(enabled);
-    }
     onKeyPress(event) {
         const shortcuts = this.editor.shortcuts;
         // Ctrl+Z: End the stroke so that it can be undone/redone.

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

@@ -16,6 +16,7 @@ export default class PipetteTool extends BaseTool {
     private colorPreviewListener;
     private colorSelectListener;
     constructor(editor: Editor, description: string);
+    canReceiveInputInReadOnlyEditor(): boolean;
     private updateSelectingStatus;
     setColorListener(colorPreviewListener: ColorListener, colorSelectListener: ColorListener): void;
     clearColorListener(): void;

package/dist/cjs/tools/PipetteTool.js

@@ -23,6 +23,9 @@ class PipetteTool extends BaseTool_1.default {
             this.updateSelectingStatus();
         });
     }
+    canReceiveInputInReadOnlyEditor() {
+        return true;
+    }
     // Ensures that the root editor element correctly reflects whether color selection
     // is in progress.
     updateSelectingStatus() {

package/dist/cjs/tools/SelectionTool/SelectAllShortcutHandler.d.ts

@@ -4,5 +4,6 @@ import BaseTool from '../BaseTool';
 export default class SelectAllShortcutHandler extends BaseTool {
     private editor;
     constructor(editor: Editor);
+    canReceiveInputInReadOnlyEditor(): boolean;
     onKeyPress(event: KeyPressEvent): boolean;
 }

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

@@ -12,6 +12,9 @@ class SelectAllShortcutHandler extends BaseTool_1.default {
         super(editor.notifier, editor.localization.selectAllTool);
         this.editor = editor;
     }
+    canReceiveInputInReadOnlyEditor() {
+        return true;
+    }
     // @internal
     onKeyPress(event) {
         if (this.editor.shortcuts.matchesShortcut(keybindings_1.selectAllKeyboardShortcut, event)) {

package/dist/cjs/tools/SelectionTool/Selection.d.ts

@@ -11,6 +11,7 @@ export default class Selection {
     private editor;
     private handles;
     private originalRegion;
+    private selectionTightBoundingBox;
     private transformers;
     private transform;
     private selectedElems;
@@ -39,6 +40,7 @@ export default class Selection {
     private previewTransformCmds;
     resolveToObjects(): boolean;
     recomputeRegion(): boolean;
+    padRegion(): void;
     getMinCanvasSize(): number;
     getSelectedItemCount(): number;
     updateUI(): void;

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

@@ -40,13 +40,16 @@ const Erase_1 = __importDefault(require("../../commands/Erase"));
 const Duplicate_1 = __importDefault(require("../../commands/Duplicate"));
 const TransformMode_1 = require("./TransformMode");
 const types_1 = require("./types");
-const EditorImage_1 = __importDefault(require("../../EditorImage"));
+const EditorImage_1 = __importDefault(require("../../image/EditorImage"));
 const updateChunkSize = 100;
 const maxPreviewElemCount = 500;
 // @internal
 class Selection {
     constructor(startPoint, editor) {
         this.editor = editor;
+        // The last-computed bounding box of selected content
+        // @see getTightBoundingBox
+        this.selectionTightBoundingBox = null;
         this.transform = math_1.Mat33.identity;
         this.selectedElems = [];
         this.hasParent = true;
@@ -65,10 +68,23 @@ class Selection {
         this.backgroundElem = document.createElement('div');
         this.backgroundElem.classList.add(`${SelectionTool_1.cssPrefix}selection-background`);
         this.container.appendChild(this.backgroundElem);
-        const resizeHorizontalHandle = new SelectionHandle_1.default(SelectionHandle_1.HandleShape.Square, math_1.Vec2.of(1, 0.5), this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, types_1.ResizeMode.HorizontalOnly), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
-        const resizeVerticalHandle = new SelectionHandle_1.default(SelectionHandle_1.HandleShape.Square, math_1.Vec2.of(0.5, 1), this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, types_1.ResizeMode.VerticalOnly), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
-        const resizeBothHandle = new SelectionHandle_1.default(SelectionHandle_1.HandleShape.Square, math_1.Vec2.of(1, 1), this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, types_1.ResizeMode.Both), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
-        const rotationHandle = new SelectionHandle_1.default(SelectionHandle_1.HandleShape.Circle, math_1.Vec2.of(0.5, 0), this, this.editor.viewport, (startPoint) => this.transformers.rotate.onDragStart(startPoint), (currentPoint) => this.transformers.rotate.onDragUpdate(currentPoint), () => this.transformers.rotate.onDragEnd());
+        const resizeHorizontalHandle = new SelectionHandle_1.default({
+            action: SelectionHandle_1.HandleAction.ResizeX,
+            side: math_1.Vec2.of(1, 0.5),
+        }, this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, types_1.ResizeMode.HorizontalOnly), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
+        const resizeVerticalHandle = new SelectionHandle_1.default({
+            action: SelectionHandle_1.HandleAction.ResizeY,
+            side: math_1.Vec2.of(0.5, 1),
+        }, this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, types_1.ResizeMode.VerticalOnly), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
+        const resizeBothHandle = new SelectionHandle_1.default({
+            action: SelectionHandle_1.HandleAction.ResizeXY,
+            side: math_1.Vec2.of(1, 1),
+        }, this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, types_1.ResizeMode.Both), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
+        const rotationHandle = new SelectionHandle_1.default({
+            action: SelectionHandle_1.HandleAction.Rotate,
+            side: math_1.Vec2.of(0.5, 0),
+            icon: this.editor.icons.makeRotateIcon(),
+        }, this, this.editor.viewport, (startPoint) => this.transformers.rotate.onDragStart(startPoint), (currentPoint) => this.transformers.rotate.onDragUpdate(currentPoint), () => this.transformers.rotate.onDragEnd());
         this.handles = [
             resizeBothHandle,
             resizeHorizontalHandle,
@@ -195,18 +211,26 @@ class Selection {
     // Returns false if the selection is empty.
     recomputeRegion() {
         const newRegion = this.computeTightBoundingBox();
+        this.selectionTightBoundingBox = newRegion;
         if (!newRegion) {
             this.cancelSelection();
             return false;
         }
         this.originalRegion = newRegion;
+        this.padRegion();
+        return true;
+    }
+    // Applies padding to the current region if it is too small.
+    // @internal
+    padRegion() {
+        const sourceRegion = this.selectionTightBoundingBox ?? this.originalRegion;
         const minSize = this.getMinCanvasSize();
-        if (this.originalRegion.w < minSize || this.originalRegion.h < minSize) {
+        if (sourceRegion.w < minSize || sourceRegion.h < minSize) {
             // Add padding
             const padding = minSize / 2;
-            this.originalRegion = math_1.Rect2.bboxOf(this.originalRegion.corners, padding);
+            this.originalRegion = math_1.Rect2.bboxOf(sourceRegion.corners, padding);
+            this.updateUI();
         }
-        return true;
     }
     getMinCanvasSize() {
         const canvasHandleSize = SelectionHandle_1.handleSize / this.editor.viewport.getScaleFactor();
@@ -230,6 +254,14 @@ class Selection {
         const rotationDeg = this.screenRegionRotation * 180 / Math.PI;
         this.backgroundElem.style.transform = `rotate(${rotationDeg}deg)`;
         this.backgroundElem.style.transformOrigin = 'center';
+        // If closer to perpendicular, apply different CSS
+        const perpendicularClassName = `${SelectionTool_1.cssPrefix}rotated-near-perpendicular`;
+        if (Math.abs(Math.sin(this.screenRegionRotation)) > 0.5) {
+            this.container.classList.add(perpendicularClassName);
+        }
+        else {
+            this.container.classList.remove(perpendicularClassName);
+        }
         for (const handle of this.handles) {
             handle.updatePosition();
         }
@@ -401,6 +433,7 @@ class Selection {
     }
     setToPoint(point) {
         this.originalRegion = this.originalRegion.grownToPoint(point);
+        this.selectionTightBoundingBox = null;
         this.updateUI();
     }
     cancelSelection() {
@@ -408,12 +441,15 @@ class Selection {
             this.container.remove();
         }
         this.originalRegion = math_1.Rect2.empty;
+        this.selectionTightBoundingBox = null;
         this.hasParent = false;
     }
     setSelectedObjects(objects, bbox) {
         this.addRemoveSelectionFromImage(true);
         this.originalRegion = bbox;
+        this.selectionTightBoundingBox = bbox;
         this.selectedElems = objects.filter(object => object.isSelectable());
+        this.padRegion();
         this.updateUI();
     }
     getSelectedObjects() {

package/dist/cjs/tools/SelectionTool/SelectionHandle.d.ts

@@ -2,17 +2,23 @@ import { Point2, Vec2 } from '@js-draw/math';
 import Selection from './Selection';
 import Pointer from '../../Pointer';
 import Viewport from '../../Viewport';
-export declare enum HandleShape {
-    Circle = 0,
-    Square = 1
+export declare enum HandleAction {
+    ResizeXY = "resize-xy",
+    Rotate = "rotate",
+    ResizeX = "resize-x",
+    ResizeY = "resize-y"
+}
+export interface HandlePresentation {
+    side: Vec2;
+    icon?: Element;
+    action: HandleAction;
 }
 export declare const handleSize = 30;
 export type DragStartCallback = (startPoint: Point2) => void;
 export type DragUpdateCallback = (canvasPoint: Point2) => void;
 export type DragEndCallback = () => void;
 export default class SelectionHandle {
-    readonly shape: HandleShape;
-    private readonly parentSide;
+    readonly presentation: HandlePresentation;
     private readonly parent;
     private readonly viewport;
     private readonly onDragStart;
@@ -20,7 +26,9 @@ export default class SelectionHandle {
     private readonly onDragEnd;
     private element;
     private snapToGrid;
-    constructor(shape: HandleShape, parentSide: Vec2, parent: Selection, viewport: Viewport, onDragStart: DragStartCallback, onDragUpdate: DragUpdateCallback, onDragEnd: DragEndCallback);
+    private shape;
+    private parentSide;
+    constructor(presentation: HandlePresentation, parent: Selection, viewport: Viewport, onDragStart: DragStartCallback, onDragUpdate: DragUpdateCallback, onDragEnd: DragEndCallback);
     /**
      * Adds this to `container`, where `conatiner` should be the background/selection
      * element visible on the screen.