js-draw 1.30.0 → 1.30.1

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

@@ -7,6 +7,7 @@ import  { EditorEventType }  from '../../types.mjs';
 import  { toolbarCSSPrefix }  from '../constants.mjs';
 import  makeColorInput  from './components/makeColorInput.mjs';
 import  BaseWidget  from './BaseWidget.mjs';
+import  createButton  from '../../util/dom/createButton.mjs';
 class DocumentPropertiesWidget extends BaseWidget {
     constructor(editor, localizationTable) {
         super(editor, 'document-properties-widget', localizationTable);
@@ -216,9 +217,10 @@ class DocumentPropertiesWidget extends BaseWidget {
             this.editor.dispatch(image.setAutoresizeEnabled(checked));
         });
         // The "About..." button
-        const aboutButton = document.createElement('button');
-        aboutButton.classList.add('about-button');
-        aboutButton.innerText = this.localizationTable.about;
+        const aboutButton = createButton({
+            classList: ['about-button'],
+            text: this.localizationTable.about,
+        });
         aboutButton.onclick = () => {
             this.editor.showAboutDialog();
         };

package/dist/mjs/toolbar/widgets/HandToolWidget.mjs

@@ -6,11 +6,12 @@ import  { toolbarCSSPrefix }  from '../constants.mjs';
 import  BaseToolWidget  from './BaseToolWidget.mjs';
 import  BaseWidget  from './BaseWidget.mjs';
 import  makeSeparator  from './components/makeSeparator.mjs';
+import  createButton  from '../../util/dom/createButton.mjs';
 const makeZoomControl = (localizationTable, editor, helpDisplay) => {
     const zoomLevelRow = document.createElement('div');
-    const increaseButton = document.createElement('button');
-    const decreaseButton = document.createElement('button');
-    const resetViewButton = document.createElement('button');
+    const increaseButton = createButton();
+    const decreaseButton = createButton();
+    const resetViewButton = createButton();
     const zoomLevelDisplay = document.createElement('span');
     increaseButton.innerText = '+';
     decreaseButton.innerText = '-';

package/dist/mjs/toolbar/widgets/InsertImageWidget/InsertImageWidget.mjs

@@ -13,6 +13,7 @@ import  bytesToSizeString  from '../../../util/bytesToSizeString.mjs';
 import  { ImageWrapper }  from './ImageWrapper.mjs';
 import  makeSnappedList  from '../components/makeSnappedList.mjs';
 import  fileToImages  from './fileToImages.mjs';
+import  createButton  from '../../../util/dom/createButton.mjs';
 /**
  * Provides a widget that allows inserting or modifying raster images.
  *
@@ -78,7 +79,7 @@ class InsertImageWidget extends BaseWidget {
         const actionButtonRow = document.createElement('div');
         actionButtonRow.classList.add('action-button-row');
         this.statusView.classList.add('insert-image-image-status-view');
-        this.submitButton = document.createElement('button');
+        this.submitButton = createButton();
         this.selectedFiles = selectedFiles;
         this.imageAltTextInput = document.createElement('input');
         // Label the alt text input
@@ -165,16 +166,18 @@ class InsertImageWidget extends BaseWidget {
         const sizeText = document.createElement('span');
         sizeText.innerText = this.localizationTable.imageSize(Math.round(size), units);
         // Add a button to allow decreasing the size of large images.
-        const decreaseSizeButton = document.createElement('button');
-        decreaseSizeButton.innerText = this.localizationTable.decreaseImageSize;
-        decreaseSizeButton.onclick = () => {
-            currentImage?.decreaseSize();
-        };
-        const resetSizeButton = document.createElement('button');
-        resetSizeButton.innerText = this.localizationTable.resetImage;
-        resetSizeButton.onclick = () => {
-            currentImage?.reset();
-        };
+        const decreaseSizeButton = createButton({
+            text: this.localizationTable.decreaseImageSize,
+            onClick: () => {
+                currentImage?.decreaseSize();
+            },
+        });
+        const resetSizeButton = createButton({
+            text: this.localizationTable.resetImage,
+            onClick: () => {
+                currentImage?.reset();
+            },
+        });
         this.statusView.replaceChildren(sizeText);
         if (currentImage?.isLarge()) {
             this.statusView.appendChild(decreaseSizeButton);

package/dist/mjs/toolbar/widgets/PenToolWidget.mjs

@@ -13,6 +13,7 @@ import  { toolbarCSSPrefix }  from '../constants.mjs';
 import  makeThicknessSlider  from './components/makeThicknessSlider.mjs';
 import  makeGridSelector  from './components/makeGridSelector.mjs';
 import  { makePolylineBuilder }  from '../../components/builders/PolylineBuilder.mjs';
+import  createElement  from '../../util/dom/createElement.mjs';
 /**
  * This toolbar widget allows a user to control a single {@link Pen} tool.
  *
@@ -179,7 +180,7 @@ class PenToolWidget extends BaseToolWidget {
         const container = document.createElement('div');
         container.classList.add('action-button-row', `${toolbarCSSPrefix}-pen-tool-toggle-buttons`);
         const addToggleButton = (labelText, icon) => {
-            const button = document.createElement('button');
+            const button = createElement('button', { type: 'button' });
             button.classList.add(`${toolbarCSSPrefix}-toggle-button`);
             const iconElement = icon.cloneNode(true);
             iconElement.classList.add('icon');

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

@@ -1,4 +1,5 @@
-import  addLongPressOrHoverCssClasses  from '../../../util/addLongPressOrHoverCssClasses.mjs';
+import  addLongPressOrHoverCssClasses  from '../../../util/dom/addLongPressOrHoverCssClasses.mjs';
+import  createButton  from '../../../util/dom/createButton.mjs';
 /**
  * Creates HTML `button` elements from `buttonSpecs` and displays them in a
  * grid with `columnCount` columns.
@@ -8,7 +9,7 @@ const makeButtonGrid = (buttonSpecs, columnCount) => {
     container.classList.add('toolbar-button-grid');
     container.style.setProperty('--column-count', `${columnCount}`);
     const makeButton = (buttonSpec) => {
-        const buttonElement = document.createElement('button');
+        const buttonElement = createButton();
         buttonElement.classList.add('button');
         const iconElement = buttonSpec.icon();
         iconElement.classList.add('icon');

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

@@ -1,6 +1,7 @@
 import { Color4 } from '@js-draw/math';
 import  PipetteTool  from '../../../tools/PipetteTool.mjs';
 import  { EditorEventType }  from '../../../types.mjs';
+import  createButton  from '../../../util/dom/createButton.mjs';
 // Returns [ color input, input container, callback to change the color value ].
 export const makeColorInput = (editor, onColorChange) => {
     const container = document.createElement('span');
@@ -93,7 +94,7 @@ export const makeColorInput = (editor, onColorChange) => {
     };
 };
 const addPipetteTool = (editor, container, onColorChange) => {
-    const pipetteButton = document.createElement('button');
+    const pipetteButton = createButton();
     pipetteButton.classList.add('pipetteButton');
     pipetteButton.title = editor.localization.pickColorFromScreen;
     pipetteButton.setAttribute('alt', pipetteButton.title);

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

@@ -1,6 +1,6 @@
 import  { MutableReactiveValue }  from '../../../util/ReactiveValue.mjs';
-import  stopPropagationOfScrollingWheelEvents  from '../../../util/stopPropagationOfScrollingWheelEvents.mjs';
-import  addLongPressOrHoverCssClasses  from '../../../util/addLongPressOrHoverCssClasses.mjs';
+import  stopPropagationOfScrollingWheelEvents  from '../../../util/dom/stopPropagationOfScrollingWheelEvents.mjs';
+import  addLongPressOrHoverCssClasses  from '../../../util/dom/addLongPressOrHoverCssClasses.mjs';
 import  { toolbarCSSPrefix }  from '../../constants.mjs';
 let idCounter = 0;
 /**

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

@@ -1,4 +1,4 @@
-import  stopPropagationOfScrollingWheelEvents  from '../../../util/stopPropagationOfScrollingWheelEvents.mjs';
+import  stopPropagationOfScrollingWheelEvents  from '../../../util/dom/stopPropagationOfScrollingWheelEvents.mjs';
 import  { MutableReactiveValue, ReactiveValue }  from '../../../util/ReactiveValue.mjs';
 /**
  * Creates a list that snaps to each item and reports the selected item.

package/dist/mjs/tools/FindTool.mjs

@@ -5,6 +5,7 @@ import  TextComponent  from '../components/TextComponent.mjs';
 import  ImageComponent  from '../components/ImageComponent.mjs';
 import  BaseTool  from './BaseTool.mjs';
 import  { toggleFindVisibleShortcutId }  from './keybindings.mjs';
+import  createButton  from '../util/dom/createButton.mjs';
 const cssPrefix = 'find-tool';
 export default class FindTool extends BaseTool {
     constructor(editor) {
@@ -62,8 +63,8 @@ export default class FindTool extends BaseTool {
     fillOverlay() {
         const label = document.createElement('label');
         this.searchInput = document.createElement('input');
-        const nextBtn = document.createElement('button');
-        const closeBtn = document.createElement('button');
+        const nextBtn = createButton();
+        const closeBtn = createButton();
         // Math.random() ensures that the ID is unique (to allow us to refer to it
         // with an htmlFor).
         this.searchInput.setAttribute('id', `${cssPrefix}-searchInput-${Math.random()}`);

package/dist/mjs/tools/SelectionTool/SelectionMenuShortcut.mjs

@@ -1,5 +1,6 @@
 import { Rect2, Vec2 } from '@js-draw/math';
 import  { cssPrefix }  from './SelectionTool.mjs';
+import  createButton  from '../../util/dom/createButton.mjs';
 const verticalOffset = 40;
 export default class SelectionMenuShortcut {
     constructor(parent, viewport, icon, showContextMenu, localization) {
@@ -20,8 +21,9 @@ export default class SelectionMenuShortcut {
         this.updatePosition();
     }
     initUI() {
-        const button = document.createElement('button');
-        this.icon.classList.add('icon');
+        const button = createButton({
+            classList: ['icon'],
+        });
         button.replaceChildren(this.icon);
         button.ariaLabel = this.localization.selectionMenu__show;
         button.title = button.ariaLabel;

package/dist/mjs/tools/SoundUITool.mjs

@@ -1,5 +1,6 @@
 import { LineSegment2, Color4 } from '@js-draw/math';
 import  BaseTool  from './BaseTool.mjs';
+import  createButton  from '../util/dom/createButton.mjs';
 class SoundFeedback {
     constructor() {
         this.closed = false;
@@ -92,10 +93,11 @@ export default class SoundUITool extends BaseTool {
         // Create a screen-reader-usable method of toggling the tool:
         this.toggleButtonContainer = document.createElement('div');
         this.toggleButtonContainer.classList.add('js-draw-sound-ui-toggle');
-        this.toggleButton = document.createElement('button');
-        this.toggleButton.onclick = () => {
-            this.setEnabled(!this.isEnabled());
-        };
+        this.toggleButton = createButton({
+            onClick: () => {
+                this.setEnabled(!this.isEnabled());
+            },
+        });
         this.toggleButtonContainer.appendChild(this.toggleButton);
         this.updateToggleButtonText();
         editor.createHTMLOverlay(this.toggleButtonContainer);

package/dist/mjs/tools/util/createMenuOverlay.mjs

@@ -1,5 +1,6 @@
 import  waitForTimeout  from '../../util/waitForTimeout.mjs';
 import  { EditorEventType }  from '../../types.mjs';
+import  createButton  from '../../util/dom/createButton.mjs';
 let idCounter = 0;
 const createMenuOverlay = async (editor, canvasAnchor, options) => {
     const overlay = document.createElement('div');
@@ -96,16 +97,17 @@ const createMenuOverlay = async (editor, canvasAnchor, options) => {
             }
         });
         for (const option of options) {
-            const optionElement = document.createElement('button');
+            const optionElement = createButton({
+                classList: ['option', 'editor-popup-menu-option'],
+                onClick: (event) => {
+                    if (event.defaultPrevented)
+                        return;
+                    onOptionSelected(option.key);
+                },
+            });
             optionElement.id = `menu-overlay-option-${idCounter++}`;
             optionElement.role = 'menuitem';
-            optionElement.classList.add('option', 'editor-popup-menu-option');
             optionElement.replaceChildren(option.icon(), document.createTextNode(option.text));
-            optionElement.onclick = (event) => {
-                if (event.defaultPrevented)
-                    return;
-                onOptionSelected(option.key);
-            };
             contentElement.appendChild(optionElement);
             if (optionElements.length === 0) {
                 optionElement.autofocus = true;

package/dist/mjs/util/dom/createButton.d.ts

@@ -0,0 +1,7 @@
+interface Options {
+    onClick?: (event: MouseEvent) => void;
+    text?: string;
+    classList?: string[];
+}
+declare const createButton: ({ onClick, text, classList }?: Options) => HTMLButtonElement;
+export default createButton;

package/dist/mjs/util/dom/createButton.mjs

@@ -0,0 +1,15 @@
+import  createElement  from './createElement.mjs';
+const createButton = ({ onClick, text, classList = [] } = {}) => {
+    const button = createElement('button', { type: 'button' });
+    if (onClick) {
+        button.onclick = onClick;
+    }
+    if (text) {
+        button.textContent = text;
+    }
+    for (const className of classList) {
+        button.classList.add(className);
+    }
+    return button;
+};
+export default createButton;

package/dist/mjs/util/{createElement.d.ts → dom/createElement.d.ts}

@@ -11,6 +11,9 @@ interface ElementToPropertiesMap {
         'stroke-width': string;
         transform: string;
     };
+    button: {
+        type: 'button';
+    };
     rect: {
         stroke: string;
         fill: string;

package/dist/mjs/version.mjs

@@ -5,5 +5,5 @@
  */
 export default {
     // Note: Auto-updated by prebuild.js:
-    number: '1.30.0',
+    number: '1.30.1',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "js-draw",
-	"version": "1.30.0",
+	"version": "1.30.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,11 +64,11 @@
 		"postpack": "ts-node tools/copyREADME.ts revert"
 	},
 	"dependencies": {
-		"@js-draw/math": "^1.30.0",
+		"@js-draw/math": "^1.30.1",
 		"@melloware/coloris": "0.22.0"
 	},
 	"devDependencies": {
-		"@js-draw/build-tool": "^1.30.0",
+		"@js-draw/build-tool": "^1.30.1",
 		"@types/jest": "29.5.5",
 		"@types/jsdom": "21.1.3"
 	},
@@ -86,5 +86,5 @@
 		"freehand",
 		"svg"
 	],
-	"gitHead": "66eec6d2c16262c5397ab158967afb55428f7008"
+	"gitHead": "a416de226b49ee0c9244ec7f7b9522515a49bcb7"
 }