js-draw 1.21.3 → 1.23.1

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

@@ -97,7 +97,7 @@ class HandModeWidget extends BaseWidget_1.default {
         this.makeIcon = makeIcon;
         this.title = title;
         this.helpText = helpText;
-        editor.notifier.on(types_1.EditorEventType.ToolUpdated, toolEvt => {
+        editor.notifier.on(types_1.EditorEventType.ToolUpdated, (toolEvt) => {
             if (toolEvt.kind === types_1.EditorEventType.ToolUpdated && toolEvt.tool === tool) {
                 const allEnabled = !!(tool.getMode() & PanZoom_1.PanZoomMode.SinglePointerGestures);
                 this.setSelected(!!(tool.getMode() & flag) || allEnabled);
@@ -140,12 +140,12 @@ class HandToolWidget extends BaseToolWidget_1.default {
     // If the primary, the override will be gotten from the editor's tool controller.
     tool, localizationTable) {
         const isGivenToolPrimary = editor.toolController.getPrimaryTools().includes(tool);
-        const primaryTool = (isGivenToolPrimary ? tool : HandToolWidget.getPrimaryHandTool(editor.toolController))
-            ?? tool;
+        const primaryTool = (isGivenToolPrimary ? tool : HandToolWidget.getPrimaryHandTool(editor.toolController)) ??
+            tool;
         super(editor, primaryTool, 'hand-tool-widget', localizationTable);
         this.overridePanZoomTool =
-            (isGivenToolPrimary ? HandToolWidget.getOverrideHandTool(editor.toolController) : tool)
-                ?? tool;
+            (isGivenToolPrimary ? HandToolWidget.getOverrideHandTool(editor.toolController) : tool) ??
+                tool;
         // Only allow toggling a hand tool if we're using the primary hand tool and not the override
         // hand tool for this button.
         this.allowTogglingBaseTool = primaryTool !== null;
@@ -160,7 +160,9 @@ class HandToolWidget extends BaseToolWidget_1.default {
         this.addSubWidget(rotationLockWidget);
     }
     static getPrimaryHandTool(toolController) {
-        const primaryPanZoomToolList = toolController.getPrimaryTools().filter(tool => tool instanceof PanZoom_1.default);
+        const primaryPanZoomToolList = toolController
+            .getPrimaryTools()
+            .filter((tool) => tool instanceof PanZoom_1.default);
         const primaryPanZoomTool = primaryPanZoomToolList[0];
         return primaryPanZoomTool;
     }

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

@@ -39,7 +39,7 @@ class InsertImageWidget extends BaseWidget_1.default {
         super(editor, 'insert-image-widget', localization);
         // Make the dropdown showable
         this.container.classList.add('dropdownShowable');
-        editor.notifier.on(types_1.EditorEventType.SelectionUpdated, event => {
+        editor.notifier.on(types_1.EditorEventType.SelectionUpdated, (event) => {
             if (event.kind === types_1.EditorEventType.SelectionUpdated && this.isDropdownVisible()) {
                 this.updateInputs();
             }
@@ -72,7 +72,7 @@ class InsertImageWidget extends BaseWidget_1.default {
     fillDropdown(dropdown) {
         const container = document.createElement('div');
         container.classList.add('insert-image-widget-dropdown-content', `${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}nonbutton-controls-main-list`);
-        const { container: chooseImageRow, selectedFiles, } = (0, makeFileInput_1.default)(this.localizationTable.chooseFile, this.editor, {
+        const { container: chooseImageRow, selectedFiles } = (0, makeFileInput_1.default)(this.localizationTable.chooseFile, this.editor, {
             accepts: 'image/*',
             allowMultiSelect: true,
             customPickerAction: this.editor.getCurrentSettings().image?.showImagePicker,
@@ -120,7 +120,7 @@ class InsertImageWidget extends BaseWidget_1.default {
                     this.statusView.innerText = errorMessage;
                     return [];
                 }
-                return renderableImages.map(image => {
+                return renderableImages.map((image) => {
                     const { wrapper, preview } = ImageWrapper_1.ImageWrapper.fromRenderable(image, () => this.onImageDataUpdate());
                     return {
                         data: wrapper,
@@ -188,7 +188,9 @@ class InsertImageWidget extends BaseWidget_1.default {
             this.statusView.appendChild(resetSizeButton);
         }
         else {
-            const hasLargeOrChangedImages = this.images.get().some(image => image.data?.isChanged() || image.data?.isLarge());
+            const hasLargeOrChangedImages = this.images
+                .get()
+                .some((image) => image.data?.isChanged() || image.data?.isLarge());
             if (hasLargeOrChangedImages) {
                 // Still show the button -- prevents the layout from readjusting while
                 // scrolling through the image list
@@ -207,7 +209,7 @@ class InsertImageWidget extends BaseWidget_1.default {
         };
         resetInputs();
         const selectionTools = this.editor.toolController.getMatchingTools(SelectionTool_1.default);
-        const selectedObjects = selectionTools.map(tool => tool.getSelectedObjects()).flat();
+        const selectedObjects = selectionTools.map((tool) => tool.getSelectedObjects()).flat();
         // Check: Is there a selected image that can be edited?
         let editingImage = null;
         if (selectedObjects.length === 1 && selectedObjects[0] instanceof ImageComponent_1.default) {
@@ -219,7 +221,7 @@ class InsertImageWidget extends BaseWidget_1.default {
         }
         else if (selectedObjects.length > 0) {
             // If not, clear the selection.
-            selectionTools.forEach(tool => tool.clearSelection());
+            selectionTools.forEach((tool) => tool.clearSelection());
         }
         // Show the submit button only when there is data to submit.
         this.submitButton.style.display = 'none';
@@ -275,10 +277,7 @@ class InsertImageWidget extends BaseWidget_1.default {
                     for (const component of newComponents) {
                         commands.push(EditorImage_1.default.addElement(component), component.transformBy(originalTransform.rightMul(widthAdjustTransform)), component.setZIndex(editingImage.getZIndex()));
                     }
-                    this.editor.dispatch((0, uniteCommands_1.default)([
-                        ...commands,
-                        eraseCommand,
-                    ]));
+                    this.editor.dispatch((0, uniteCommands_1.default)([...commands, eraseCommand]));
                     selectionTools[0]?.setSelection(newComponents);
                 }
                 else {

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

@@ -51,7 +51,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
                 id: 'polyline-pen',
                 factory: PolylineBuilder_1.makePolylineBuilder,
             },
-            ...(additionalPens.filter(pen => !pen.isShapeBuilder)),
+            ...additionalPens.filter((pen) => !pen.isShapeBuilder),
             // Shape pens
             {
                 name: this.localizationTable.arrowPen,
@@ -83,9 +83,9 @@ class PenToolWidget extends BaseToolWidget_1.default {
                 isShapeBuilder: true,
                 factory: CircleBuilder_1.makeOutlinedCircleBuilder,
             },
-            ...(additionalPens.filter(pen => pen.isShapeBuilder)),
+            ...additionalPens.filter((pen) => pen.isShapeBuilder),
         ].filter(filterPens);
-        this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, toolEvt => {
+        this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, (toolEvt) => {
             if (toolEvt.kind !== types_1.EditorEventType.ToolUpdated) {
                 throw new Error('Invalid event type!');
             }
@@ -128,7 +128,10 @@ class PenToolWidget extends BaseToolWidget_1.default {
             style.factory = record.factory;
         }
         const strokeFactory = record?.factory;
-        if (!strokeFactory || strokeFactory === FreehandLineBuilder_1.makeFreehandLineBuilder || strokeFactory === PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder || strokeFactory === PolylineBuilder_1.makePolylineBuilder) {
+        if (!strokeFactory ||
+            strokeFactory === FreehandLineBuilder_1.makeFreehandLineBuilder ||
+            strokeFactory === PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder ||
+            strokeFactory === PolylineBuilder_1.makePolylineBuilder) {
             return this.editor.icons.makePenIcon(style);
         }
         else {
@@ -148,8 +151,10 @@ class PenToolWidget extends BaseToolWidget_1.default {
                 isShapeBuilder: penType.isShapeBuilder ?? false,
             };
         });
-        const penSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectPenType, this.getCurrentPenTypeIdx(), allChoices.filter(choice => !choice.isShapeBuilder));
-        const shapeSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectShape, this.getCurrentPenTypeIdx(), allChoices.filter(choice => choice.isShapeBuilder));
+        const penItems = allChoices.filter((choice) => !choice.isShapeBuilder);
+        const penSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectPenType, this.getCurrentPenTypeIdx(), penItems);
+        const shapeItems = allChoices.filter((choice) => choice.isShapeBuilder);
+        const shapeSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectShape, this.getCurrentPenTypeIdx(), shapeItems);
         const onSelectorUpdate = (newPenTypeIndex) => {
             this.tool.setStrokeFactory(this.penTypes[newPenTypeIndex].factory);
         };
@@ -166,8 +171,12 @@ class PenToolWidget extends BaseToolWidget_1.default {
                 shapeSelector.updateIcons();
             },
             addTo: (parent) => {
-                penSelector.addTo(parent);
-                shapeSelector.addTo(parent);
+                if (penItems.length) {
+                    penSelector.addTo(parent);
+                }
+                if (shapeItems.length) {
+                    shapeSelector.addTo(parent);
+                }
             },
         };
     }
@@ -205,11 +214,11 @@ class PenToolWidget extends BaseToolWidget_1.default {
             return result;
         };
         const stabilizationOption = addToggleButton(this.localizationTable.inputStabilization, this.editor.icons.makeStrokeSmoothingIcon());
-        stabilizationOption.setOnInputListener(enabled => {
+        stabilizationOption.setOnInputListener((enabled) => {
             this.tool.setHasStabilization(enabled);
         });
         const autocorrectOption = addToggleButton(this.localizationTable.strokeAutocorrect, this.editor.icons.makeShapeAutocorrectIcon());
-        autocorrectOption.setOnInputListener(enabled => {
+        autocorrectOption.setOnInputListener((enabled) => {
             this.tool.setStrokeAutocorrectEnabled(enabled);
         });
         // Help text
@@ -232,12 +241,12 @@ class PenToolWidget extends BaseToolWidget_1.default {
         const container = document.createElement('div');
         container.classList.add(`${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}nonbutton-controls-main-list`);
         // Thickness: Value of the input is squared to allow for finer control/larger values.
-        const { container: thicknessRow, setValue: setThickness } = (0, makeThicknessSlider_1.default)(this.editor, thickness => {
+        const { container: thicknessRow, setValue: setThickness } = (0, makeThicknessSlider_1.default)(this.editor, (thickness) => {
             this.tool.setThickness(thickness);
         });
         const colorRow = document.createElement('div');
         const colorLabel = document.createElement('label');
-        const colorInputControl = (0, makeColorInput_1.default)(this.editor, color => {
+        const colorInputControl = (0, makeColorInput_1.default)(this.editor, (color) => {
             this.tool.setColor(color);
         });
         const { input: colorInput, container: colorInputContainer } = colorInputControl;
@@ -306,7 +315,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
     deserializeFrom(state) {
         super.deserializeFrom(state);
         const verifyPropertyType = (propertyName, expectedType) => {
-            const actualType = typeof (state[propertyName]);
+            const actualType = typeof state[propertyName];
             if (actualType !== expectedType) {
                 throw new Error(`Deserializing property ${propertyName}: Invalid type. Expected ${expectedType},` +
                     ` was ${actualType}.`);

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

@@ -18,7 +18,7 @@ const makeFormatMenu = (editor, selectionTool, localizationTable) => {
     container.classList.add('selection-format-menu', `${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}indentedList`);
     const colorRow = document.createElement('div');
     const colorLabel = document.createElement('label');
-    const colorInputControl = (0, makeColorInput_1.default)(editor, color => {
+    const colorInputControl = (0, makeColorInput_1.default)(editor, (color) => {
         const selection = selectionTool.getSelection();
         if (selection) {
             const updateStyleCommands = [];
@@ -99,7 +99,7 @@ class SelectionToolWidget extends BaseToolWidget_1.default {
         };
         updateDisabled(true);
         // Enable/disable actions based on whether items are selected
-        this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, toolEvt => {
+        this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, (toolEvt) => {
             if (toolEvt.kind !== types_1.EditorEventType.ToolUpdated) {
                 throw new Error('Invalid event type!');
             }

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

@@ -13,7 +13,7 @@ class TextToolWidget extends BaseToolWidget_1.default {
         super(editor, tool, 'text-tool-widget', localization);
         this.tool = tool;
         this.updateDropdownInputs = null;
-        editor.notifier.on(types_1.EditorEventType.ToolUpdated, evt => {
+        editor.notifier.on(types_1.EditorEventType.ToolUpdated, (evt) => {
             if (evt.kind === types_1.EditorEventType.ToolUpdated && evt.tool === tool) {
                 this.updateIcon();
                 this.updateDropdownInputs?.();
@@ -37,7 +37,7 @@ class TextToolWidget extends BaseToolWidget_1.default {
         const fontLabel = document.createElement('label');
         const sizeInput = document.createElement('input');
         const sizeLabel = document.createElement('label');
-        const { input: colorInput, container: colorInputContainer, setValue: setColorInputValue } = (0, makeColorInput_1.default)(this.editor, color => {
+        const { input: colorInput, container: colorInputContainer, setValue: setColorInputValue, } = (0, makeColorInput_1.default)(this.editor, (color) => {
             this.tool.setColor(color);
         });
         const colorLabel = document.createElement('label');
@@ -105,13 +105,13 @@ class TextToolWidget extends BaseToolWidget_1.default {
         };
     }
     deserializeFrom(state) {
-        if (state.fontFamily && typeof (state.fontFamily) === 'string') {
+        if (state.fontFamily && typeof state.fontFamily === 'string') {
             this.tool.setFontFamily(state.fontFamily);
         }
-        if (state.color && typeof (state.color) === 'string') {
+        if (state.color && typeof state.color === 'string') {
             this.tool.setColor(math_1.Color4.fromHex(state.color));
         }
-        if (state.textSize && typeof (state.textSize) === 'number') {
+        if (state.textSize && typeof state.textSize === 'number') {
             this.tool.setFontSize(state.textSize);
         }
         super.deserializeFrom(state);

package/dist/cjs/toolbar/widgets/components/makeFileInput.js

@@ -47,7 +47,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
             icon.style.display = 'none';
         }
         else if (files.length > 0) {
-            const fileNames = files.map(file => file.name);
+            const fileNames = files.map((file) => file.name);
             const maxNames = 5;
             if (fileNames.length <= maxNames) {
                 descriptionText.textContent = fileNames.join('\n');
@@ -89,15 +89,15 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
     };
     const addFileEventListeners = () => {
         // Support dropping files
-        label.addEventListener('dragover', event => {
+        label.addEventListener('dragover', (event) => {
             event.preventDefault();
             label.classList.add('drag-target');
         });
-        label.addEventListener('dragenter', event => {
+        label.addEventListener('dragenter', (event) => {
             event.preventDefault();
             label.classList.add('drag-target');
         });
-        label.addEventListener('dragleave', event => {
+        label.addEventListener('dragleave', (event) => {
             event.preventDefault();
             // Ensure the event wasn't targeting a child.
             // See https://stackoverflow.com/a/54271161 and
@@ -108,7 +108,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
             }
         });
         // See https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop#process_the_drop
-        label.addEventListener('drop', event => {
+        label.addEventListener('drop', (event) => {
             event.preventDefault();
             label.classList.remove('drag-target');
             const fileList = [];
@@ -137,7 +137,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
                 const data = await customPickerAction({
                     setOnCancelCallback: (onCancel) => {
                         if (!loading) {
-                            throw new Error('Task already completed. Can\'t register cancel handler.');
+                            throw new Error("Task already completed. Can't register cancel handler.");
                         }
                         cancelLoading = () => {
                             cancelLoading = null;
@@ -159,7 +159,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
         };
         input.onclick = promptForFiles;
     }
-    selectedFiles.onUpdate(files => {
+    selectedFiles.onUpdate((files) => {
         if (files.length === 0 && input.files && input.files.length > 0) {
             input.value = '';
         }

package/dist/cjs/toolbar/widgets/components/makeGridSelector.js

@@ -26,7 +26,7 @@ labelText, defaultId, choices) => {
     menuContainer.id = `${constants_1.toolbarCSSPrefix}-grid-select-id-${idCounter++}`;
     (0, stopPropagationOfScrollingWheelEvents_1.default)(menuContainer);
     const label = document.createElement('label');
-    label.innerText = labelText;
+    label.textContent = labelText;
     label.htmlFor = menuContainer.id;
     outerContainer.appendChild(label);
     // All buttons in a radiogroup need the same name attribute.
@@ -88,7 +88,7 @@ labelText, defaultId, choices) => {
         // Prevent the right-click menu from being shown on long-press
         // (important for some toolbars that use long-press gestures to
         // show grid selector labels).
-        buttonContainer.oncontextmenu = event => {
+        buttonContainer.oncontextmenu = (event) => {
             event.preventDefault();
         };
         buttonContainer.replaceChildren(button, labelContainer);
@@ -107,7 +107,7 @@ labelText, defaultId, choices) => {
             choiceRecord: record,
             setChecked,
             updateIcon,
-            updateButtonRadiogroupName
+            updateButtonRadiogroupName,
         };
     };
     const buttons = [];
@@ -118,7 +118,7 @@ labelText, defaultId, choices) => {
     // However, it is still possible that selectedValue does not correspond
     // to a choice in `choices`. This is acceptable.
     outerContainer.appendChild(menuContainer);
-    selectedValue.onUpdateAndNow(choiceId => {
+    selectedValue.onUpdateAndNow((choiceId) => {
         for (let i = 0; i < buttons.length; i++) {
             buttons[i].setChecked(buttons[i].choiceRecord.id === choiceId);
         }
@@ -134,7 +134,7 @@ labelText, defaultId, choices) => {
             }
         },
         updateIcons: () => {
-            buttons.forEach(button => button.updateIcon());
+            buttons.forEach((button) => button.updateIcon());
         },
         getRootElement() {
             return outerContainer;

package/dist/cjs/toolbar/widgets/components/makeSnappedList.js

@@ -22,7 +22,10 @@ const makeSnappedList = (itemsValue) => {
         // TODO: Does it make sense for the page marker list to be focusable?
         markerContainer.setAttribute('tabindex', '-1');
         const markers = [];
-        const pairedItems = ReactiveValue_1.ReactiveValue.union([visibleIndex, itemsValue]);
+        const pairedItems = ReactiveValue_1.ReactiveValue.union([
+            visibleIndex,
+            itemsValue,
+        ]);
         pairedItems.onUpdateAndNow(([currentVisibleIndex, items]) => {
             let addedOrRemovedMarkers = false;
             // Items may have been removed from the list of pages. Make the markers reflect that.
@@ -56,7 +59,8 @@ const makeSnappedList = (itemsValue) => {
                 }
                 const markerIndex = i;
                 marker.onclick = () => {
-                    wrappedItems.get()[markerIndex]?.element?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
+                    wrappedItems
+                        .get()[markerIndex]?.element?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
                 };
             }
             // Only call .replaceChildren when necessary -- doing so on every change would
@@ -104,7 +108,7 @@ const makeSnappedList = (itemsValue) => {
             observer = null;
         }
     };
-    const wrappedItems = ReactiveValue_1.ReactiveValue.map(itemsValue, items => {
+    const wrappedItems = ReactiveValue_1.ReactiveValue.map(itemsValue, (items) => {
         return items.map((item, index) => {
             const wrapper = document.createElement('div');
             if (item.element.parentElement)
@@ -119,7 +123,7 @@ const makeSnappedList = (itemsValue) => {
         });
     });
     const lastItems = [];
-    wrappedItems.onUpdateAndNow(items => {
+    wrappedItems.onUpdateAndNow((items) => {
         visibleIndex.set(-1);
         for (const item of lastItems) {
             observer?.unobserve(item.element);
@@ -149,7 +153,7 @@ const makeSnappedList = (itemsValue) => {
             }
         }
     });
-    const visibleItem = ReactiveValue_1.ReactiveValue.map(visibleIndex, index => {
+    const visibleItem = ReactiveValue_1.ReactiveValue.map(visibleIndex, (index) => {
         const values = itemsValue.get();
         if (0 <= index && index < values.length) {
             return values[index].data;

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

@@ -9,10 +9,10 @@ const KeyboardShortcutManager_1 = __importDefault(require("../../shortcuts/Keybo
 exports.resizeImageToSelectionKeyboardShortcut = 'jsdraw.toolbar.SelectionTool.resizeImageToSelection';
 KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.resizeImageToSelectionKeyboardShortcut, ['ctrlOrMeta+r'], 'Resize image to selection');
 // Pen tool
-exports.selectStrokeTypeKeyboardShortcutIds = [1, 2, 3, 4, 5, 6, 7, 8, 9].map(id => `jsdraw.toolbar.PenTool.select-pen-${id}`);
+exports.selectStrokeTypeKeyboardShortcutIds = [1, 2, 3, 4, 5, 6, 7, 8, 9].map((id) => `jsdraw.toolbar.PenTool.select-pen-${id}`);
 for (let i = 0; i < exports.selectStrokeTypeKeyboardShortcutIds.length; i++) {
     const id = exports.selectStrokeTypeKeyboardShortcutIds[i];
-    KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(id, [`CtrlOrMeta+Digit${(i + 1)}`], 'Select pen style ' + (i + 1));
+    KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(id, [`CtrlOrMeta+Digit${i + 1}`], 'Select pen style ' + (i + 1));
 }
 // Save
 exports.saveKeyboardShortcut = 'jsdraw.toolbar.SaveActionWidget.save';

package/dist/cjs/toolbar/widgets/layout/DropdownLayoutManager.js

@@ -49,7 +49,7 @@ class Dropdown {
         }
         // Shift the dropdown if it's off the screen, but only if doing so moves it on to the screen
         // (prevents dropdowns from going almost completely offscreen on small screens).
-        if (dropdownBBox.bottom > screenHeight && (dropdownBBox.top - dropdownBBox.height > 0)) {
+        if (dropdownBBox.bottom > screenHeight && dropdownBBox.top - dropdownBBox.height > 0) {
             const targetElem = this.parent.target;
             translateY = `calc(-${targetElem.clientHeight}px - 100%)`;
         }
@@ -136,7 +136,7 @@ class DropdownLayoutManager {
                 return;
             announceForAccessibility(this.localization.dropdownShown(dropdown.parent.getTitle()));
             // Share the event with other connected notifiers
-            this.connectedNotifiers.forEach(notifier => {
+            this.connectedNotifiers.forEach((notifier) => {
                 notifier.dispatch(types_1.EditorEventType.ToolbarDropdownShown, {
                     kind: types_1.EditorEventType.ToolbarDropdownShown,
                     fromToplevelDropdown,
@@ -173,7 +173,7 @@ class DropdownLayoutManager {
     refreshListeners() {
         const clearListeners = () => {
             // Remove all listeners & resources that won't be garbage collected.
-            this.listeners.forEach(l => l.remove());
+            this.listeners.forEach((l) => l.remove());
             this.listeners = [];
         };
         if (this.dropdowns.size === 0) {
@@ -181,11 +181,11 @@ class DropdownLayoutManager {
         }
         else if (this.listeners.length !== this.connectedNotifiers.length) {
             clearListeners();
-            this.listeners = this.connectedNotifiers.map(notifier => {
+            this.listeners = this.connectedNotifiers.map((notifier) => {
                 return notifier.on(types_1.EditorEventType.ToolbarDropdownShown, (evt) => {
-                    if (evt.kind !== types_1.EditorEventType.ToolbarDropdownShown
+                    if (evt.kind !== types_1.EditorEventType.ToolbarDropdownShown ||
                         // Don't forward to ourselves events that we originally triggered.
-                        || evt.layoutManager === this) {
+                        evt.layoutManager === this) {
                         return;
                     }
                     this.notifier.dispatch(DropdownEventType.DropdownShown, {

package/dist/cjs/tools/BaseTool.js

@@ -24,7 +24,7 @@ class BaseTool {
         _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 => {
+        __classPrivateFieldGet(this, _BaseTool_enabled, "f").onUpdate((enabled) => {
             // Ensure that at most one tool in the group is enabled.
             if (enabled) {
                 __classPrivateFieldGet(this, _BaseTool_group, "f")?.notifyEnabled(this);
@@ -48,7 +48,7 @@ class BaseTool {
     setInputMapper(mapper) {
         __classPrivateFieldSet(this, _BaseTool_inputMapper, mapper, "f");
         if (mapper) {
-            mapper.setEmitListener(event => this.dispatchEventToCallback(event));
+            mapper.setEmitListener((event) => this.dispatchEventToCallback(event));
         }
     }
     getInputMapper() {
@@ -96,7 +96,9 @@ class BaseTool {
      * Returns true iff the tool handled the event and thus should receive additional
      * events.
      */
-    onPointerDown(_event) { return false; }
+    onPointerDown(_event) {
+        return false;
+    }
     onPointerMove(_event) { }
     /**
      * Returns true iff there are additional pointers down and the tool should

package/dist/cjs/tools/Eraser.js

@@ -29,7 +29,9 @@ class EraserSwitcher extends BaseTool_1.default {
     onPointerDown(event) {
         if (event.allPointers.length === 1 && event.current.device === Pointer_1.PointerDevice.Eraser) {
             const toolController = this.editor.toolController;
-            const enabledPrimaryTools = toolController.getPrimaryTools().filter(tool => tool.isEnabled());
+            const enabledPrimaryTools = toolController
+                .getPrimaryTools()
+                .filter((tool) => tool.isEnabled());
             if (enabledPrimaryTools.length) {
                 this.previousEnabledTool = enabledPrimaryTools[0];
             }
@@ -80,7 +82,7 @@ class Eraser extends BaseTool_1.default {
         this.addCommands = [];
         this.thickness = options?.thickness ?? 10;
         this.thicknessValue = ReactiveValue_1.ReactiveValue.fromInitialValue(this.thickness);
-        this.thicknessValue.onUpdate(value => {
+        this.thicknessValue.onUpdate((value) => {
             this.thickness = value;
             this.editor.notifier.dispatch(types_1.EditorEventType.ToolUpdated, {
                 kind: types_1.EditorEventType.ToolUpdated,
@@ -88,7 +90,7 @@ class Eraser extends BaseTool_1.default {
             });
         });
         this.modeValue = ReactiveValue_1.ReactiveValue.fromInitialValue(options?.mode ?? EraserMode.FullStroke);
-        this.modeValue.onUpdate(_value => {
+        this.modeValue.onUpdate((_value) => {
             this.editor.notifier.dispatch(types_1.EditorEventType.ToolUpdated, {
                 kind: types_1.EditorEventType.ToolUpdated,
                 tool: this,
@@ -142,18 +144,20 @@ class Eraser extends BaseTool_1.default {
         const eraserRect = this.getEraserRect(currentPoint);
         const line = new math_1.LineSegment2(this.lastPoint, currentPoint);
         const region = math_1.Rect2.union(line.bbox, eraserRect);
-        const intersectingElems = this.editor.image.getElementsIntersectingRegion(region).filter(component => {
+        const intersectingElems = this.editor.image
+            .getElementsIntersectingRegion(region)
+            .filter((component) => {
             return component.intersects(line) || component.intersectsRect(eraserRect);
         });
         // Only erase components that could be selected (and thus interacted with)
         // by the user.
-        const eraseableElems = intersectingElems.filter(elem => elem.isSelectable());
+        const eraseableElems = intersectingElems.filter((elem) => elem.isSelectable());
         if (this.modeValue.get() === EraserMode.FullStroke) {
             // Remove any intersecting elements.
             this.toRemove.push(...eraseableElems);
             // Create new Erase commands for the now-to-be-erased elements and apply them.
-            const newPartialCommands = eraseableElems.map(elem => new Erase_1.default([elem]));
-            newPartialCommands.forEach(cmd => cmd.apply(this.editor));
+            const newPartialCommands = eraseableElems.map((elem) => new Erase_1.default([elem]));
+            newPartialCommands.forEach((cmd) => cmd.apply(this.editor));
             this.eraseCommands.push(...newPartialCommands);
         }
         else {
@@ -174,14 +178,15 @@ class Eraser extends BaseTool_1.default {
                 // Join the current and previous rectangles so that points between events are also
                 // erased.
                 const erasePath = math_1.Path.fromConvexHullOf([
-                    ...eraserRect.corners, ...this.getEraserRect(this.lastPoint ?? currentPoint).corners
-                ].map(p => this.editor.viewport.roundPoint(p)));
+                    ...eraserRect.corners,
+                    ...this.getEraserRect(this.lastPoint ?? currentPoint).corners,
+                ].map((p) => this.editor.viewport.roundPoint(p)));
                 toAdd.push(...targetElem.withRegionErased(erasePath, this.editor.viewport));
             }
             const eraseCommand = new Erase_1.default(toErase);
-            const newAddCommands = toAdd.map(elem => EditorImage_1.default.addElement(elem));
+            const newAddCommands = toAdd.map((elem) => EditorImage_1.default.addElement(elem));
             eraseCommand.apply(this.editor);
-            newAddCommands.forEach(command => command.apply(this.editor));
+            newAddCommands.forEach((command) => command.apply(this.editor));
             const finalToErase = [];
             for (const item of toErase) {
                 if (this.toAdd.has(item)) {
@@ -220,27 +225,27 @@ class Eraser extends BaseTool_1.default {
         this.eraseTo(event.current.canvasPos);
         const commands = [];
         if (this.addCommands.length > 0) {
-            this.addCommands.forEach(cmd => cmd.unapply(this.editor));
+            this.addCommands.forEach((cmd) => cmd.unapply(this.editor));
             // Remove items from toAdd that are also present in toRemove -- adding, then
             // removing these does nothing, and can break undo/redo.
             for (const item of this.toAdd) {
                 if (this.toRemove.includes(item)) {
                     this.toAdd.delete(item);
-                    this.toRemove = this.toRemove.filter(other => other !== item);
+                    this.toRemove = this.toRemove.filter((other) => other !== item);
                 }
             }
             for (const item of this.toRemove) {
                 if (this.toAdd.has(item)) {
                     this.toAdd.delete(item);
-                    this.toRemove = this.toRemove.filter(other => other !== item);
+                    this.toRemove = this.toRemove.filter((other) => other !== item);
                 }
             }
-            commands.push(...[...this.toAdd].map(a => EditorImage_1.default.addElement(a)));
+            commands.push(...[...this.toAdd].map((a) => EditorImage_1.default.addElement(a)));
             this.addCommands = [];
         }
         if (this.eraseCommands.length > 0) {
             // Undo commands for each individual component and unite into a single command.
-            this.eraseCommands.forEach(cmd => cmd.unapply(this.editor));
+            this.eraseCommands.forEach((cmd) => cmd.unapply(this.editor));
             this.eraseCommands = [];
             const command = new Erase_1.default(this.toRemove);
             commands.push(command);
@@ -254,8 +259,8 @@ class Eraser extends BaseTool_1.default {
         this.clearPreview();
     }
     onGestureCancel(_event) {
-        this.addCommands.forEach(cmd => cmd.unapply(this.editor));
-        this.eraseCommands.forEach(cmd => cmd.unapply(this.editor));
+        this.addCommands.forEach((cmd) => cmd.unapply(this.editor));
+        this.eraseCommands.forEach((cmd) => cmd.unapply(this.editor));
         this.eraseCommands = [];
         this.addCommands = [];
         this.clearPreview();
@@ -264,10 +269,10 @@ class Eraser extends BaseTool_1.default {
         const shortcuts = this.editor.shortcuts;
         let newThickness;
         if (shortcuts.matchesShortcut(keybindings_1.decreaseSizeKeyboardShortcutId, event)) {
-            newThickness = this.getThickness() * 2 / 3;
+            newThickness = (this.getThickness() * 2) / 3;
         }
         else if (shortcuts.matchesShortcut(keybindings_1.increaseSizeKeyboardShortcutId, event)) {
-            newThickness = this.getThickness() * 3 / 2;
+            newThickness = (this.getThickness() * 3) / 2;
         }
         if (newThickness !== undefined) {
             newThickness = Math.min(Math.max(1, newThickness), 200);

package/dist/cjs/tools/FindTool.js

@@ -27,7 +27,7 @@ class FindTool extends BaseTool_1.default {
     }
     getMatches(searchFor) {
         const lowerSearchFor = searchFor.toLocaleLowerCase();
-        const matchingComponents = this.editor.image.getAllElements().filter(component => {
+        const matchingComponents = this.editor.image.getAllElements().filter((component) => {
             let text = '';
             if (component instanceof TextComponent_1.default) {
                 text = component.getText();
@@ -42,7 +42,7 @@ class FindTool extends BaseTool_1.default {
             const hasSameCaseMatch = text.indexOf(searchFor) !== -1;
             return hasLowercaseMatch || hasSameCaseMatch;
         });
-        return matchingComponents.map(match => match.getBBox());
+        return matchingComponents.map((match) => match.getBBox());
     }
     focusCurrentMatch() {
         const matches = this.getMatches(this.searchInput.value);