js-draw 1.21.3 → 1.22.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +103 -75
- package/build-config.json +2 -2
- package/dist/Editor.css +29 -16
- package/dist/bundle.js +2 -2
- package/dist/bundledStyles.js +1 -1
- package/dist/cjs/Editor.js +36 -22
- package/dist/cjs/EventDispatcher.js +1 -1
- package/dist/cjs/Pointer.js +3 -3
- package/dist/cjs/SVGLoader/SVGLoader.js +13 -6
- package/dist/cjs/UndoRedoHistory.js +1 -1
- package/dist/cjs/Viewport.js +4 -2
- package/dist/cjs/commands/Command.js +7 -5
- package/dist/cjs/commands/Duplicate.js +2 -2
- package/dist/cjs/commands/Erase.js +3 -4
- package/dist/cjs/commands/invertCommand.js +4 -4
- package/dist/cjs/commands/lib.d.ts +1 -1
- package/dist/cjs/commands/uniteCommands.js +4 -4
- package/dist/cjs/components/AbstractComponent.d.ts +1 -1
- package/dist/cjs/components/AbstractComponent.js +3 -3
- package/dist/cjs/components/BackgroundComponent.js +8 -6
- package/dist/cjs/components/ImageComponent.js +12 -5
- package/dist/cjs/components/RestylableComponent.js +1 -1
- package/dist/cjs/components/SVGGlobalAttributesObject.js +1 -2
- package/dist/cjs/components/Stroke.js +37 -24
- package/dist/cjs/components/TextComponent.js +13 -10
- package/dist/cjs/components/UnknownSVGObject.js +2 -3
- package/dist/cjs/components/builders/ArrowBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/ArrowBuilder.js +9 -3
- package/dist/cjs/components/builders/CircleBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/CircleBuilder.js +11 -4
- package/dist/cjs/components/builders/FreehandLineBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/FreehandLineBuilder.js +10 -4
- package/dist/cjs/components/builders/LineBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/LineBuilder.js +8 -4
- package/dist/cjs/components/builders/PolylineBuilder.d.ts +4 -1
- package/dist/cjs/components/builders/PolylineBuilder.js +9 -5
- package/dist/cjs/components/builders/PressureSensitiveFreehandLineBuilder.js +16 -10
- package/dist/cjs/components/builders/RectangleBuilder.d.ts +12 -0
- package/dist/cjs/components/builders/RectangleBuilder.js +17 -3
- package/dist/cjs/components/builders/autocorrect/makeShapeFitAutocorrect.js +5 -8
- package/dist/cjs/components/builders/autocorrect/makeSnapToGridAutocorrect.js +1 -1
- package/dist/cjs/components/builders/lib.d.ts +7 -0
- package/dist/cjs/components/builders/lib.js +18 -0
- package/dist/cjs/components/lib.d.ts +1 -4
- package/dist/cjs/components/lib.js +2 -9
- package/dist/cjs/components/util/StrokeSmoother.js +5 -6
- package/dist/cjs/dialogs/makeAboutDialog.js +1 -1
- package/dist/cjs/dialogs/makeMessageDialog.js +2 -2
- package/dist/cjs/image/EditorImage.js +13 -15
- package/dist/cjs/image/export/editorImageToSVG.js +1 -1
- package/dist/cjs/inputEvents.js +3 -3
- package/dist/cjs/lib.d.ts +2 -2
- package/dist/cjs/localizations/de.js +2 -2
- package/dist/cjs/localizations/es.js +7 -3
- package/dist/cjs/rendering/Display.js +7 -3
- package/dist/cjs/rendering/RenderablePathSpec.js +26 -11
- package/dist/cjs/rendering/RenderingStyle.js +22 -15
- package/dist/cjs/rendering/TextRenderingStyle.js +1 -1
- package/dist/cjs/rendering/caching/CacheRecord.js +1 -1
- package/dist/cjs/rendering/caching/CacheRecordManager.js +1 -1
- package/dist/cjs/rendering/caching/RenderingCache.js +1 -1
- package/dist/cjs/rendering/caching/RenderingCacheNode.js +26 -15
- package/dist/cjs/rendering/caching/testUtils.js +2 -2
- package/dist/cjs/rendering/renderers/AbstractRenderer.js +3 -1
- package/dist/cjs/rendering/renderers/CanvasRenderer.js +4 -3
- package/dist/cjs/rendering/renderers/DummyRenderer.js +1 -1
- package/dist/cjs/rendering/renderers/SVGRenderer.js +37 -19
- package/dist/cjs/rendering/renderers/TextOnlyRenderer.js +13 -15
- package/dist/cjs/shortcuts/KeyBinding.js +6 -12
- package/dist/cjs/shortcuts/KeyboardShortcutManager.js +2 -2
- package/dist/cjs/testing/createEditor.js +6 -1
- package/dist/cjs/testing/findNodeWithText.d.ts +4 -1
- package/dist/cjs/testing/findNodeWithText.js +12 -3
- package/dist/cjs/testing/getUniquePointerId.js +1 -1
- package/dist/cjs/testing/sendHtmlSwipe.js +7 -3
- package/dist/cjs/testing/sendPenEvent.js +1 -3
- package/dist/cjs/testing/sendTouchEvent.js +1 -4
- package/dist/cjs/testing/startPinchGesture.js +3 -1
- package/dist/cjs/toolbar/AbstractToolbar.js +7 -11
- package/dist/cjs/toolbar/EdgeToolbar.js +11 -15
- package/dist/cjs/toolbar/IconProvider.js +5 -3
- package/dist/cjs/toolbar/localization.js +3 -3
- package/dist/cjs/toolbar/utils/HelpDisplay.js +8 -6
- package/dist/cjs/toolbar/utils/makeDraggable.js +4 -7
- package/dist/cjs/toolbar/widgets/BaseToolWidget.js +3 -2
- package/dist/cjs/toolbar/widgets/BaseWidget.js +7 -7
- package/dist/cjs/toolbar/widgets/DocumentPropertiesWidget.js +2 -2
- package/dist/cjs/toolbar/widgets/EraserToolWidget.js +5 -3
- package/dist/cjs/toolbar/widgets/HandToolWidget.js +8 -6
- package/dist/cjs/toolbar/widgets/InsertImageWidget/InsertImageWidget.js +9 -10
- package/dist/cjs/toolbar/widgets/PenToolWidget.js +22 -13
- package/dist/cjs/toolbar/widgets/SelectionToolWidget.js +2 -2
- package/dist/cjs/toolbar/widgets/TextToolWidget.js +5 -5
- package/dist/cjs/toolbar/widgets/components/makeFileInput.js +7 -7
- package/dist/cjs/toolbar/widgets/components/makeGridSelector.js +5 -5
- package/dist/cjs/toolbar/widgets/components/makeSnappedList.js +9 -5
- package/dist/cjs/toolbar/widgets/keybindings.js +2 -2
- package/dist/cjs/toolbar/widgets/layout/DropdownLayoutManager.js +6 -6
- package/dist/cjs/tools/BaseTool.js +5 -3
- package/dist/cjs/tools/Eraser.js +25 -20
- package/dist/cjs/tools/FindTool.js +2 -2
- package/dist/cjs/tools/InputFilter/ContextMenuRecognizer.js +1 -3
- package/dist/cjs/tools/InputFilter/InputMapper.js +1 -1
- package/dist/cjs/tools/InputFilter/InputPipeline.js +1 -1
- package/dist/cjs/tools/InputFilter/InputStabilizer.js +12 -5
- package/dist/cjs/tools/InputFilter/StrokeKeyboardControl.js +7 -4
- package/dist/cjs/tools/PanZoom.d.ts +1 -1
- package/dist/cjs/tools/PanZoom.js +17 -12
- package/dist/cjs/tools/PasteHandler.js +8 -2
- package/dist/cjs/tools/Pen.js +17 -9
- package/dist/cjs/tools/ScrollbarTool.js +8 -7
- package/dist/cjs/tools/SelectionTool/Selection.js +16 -12
- package/dist/cjs/tools/SelectionTool/SelectionHandle.js +5 -2
- package/dist/cjs/tools/SelectionTool/SelectionMenuShortcut.js +3 -1
- package/dist/cjs/tools/SelectionTool/SelectionTool.js +25 -16
- package/dist/cjs/tools/SelectionTool/ToPointerAutoscroller.js +1 -1
- package/dist/cjs/tools/SelectionTool/TransformMode.js +6 -7
- package/dist/cjs/tools/SelectionTool/util/makeClipboardErrorHandlers.js +23 -2
- package/dist/cjs/tools/SelectionTool/util/showSelectionContextMenu.js +29 -20
- package/dist/cjs/tools/SoundUITool.js +5 -3
- package/dist/cjs/tools/TextTool.js +8 -6
- package/dist/cjs/tools/ToolController.js +16 -10
- package/dist/cjs/tools/localization.d.ts +2 -0
- package/dist/cjs/tools/localization.js +3 -1
- package/dist/cjs/tools/util/StationaryPenDetector.js +3 -3
- package/dist/cjs/tools/util/createMenuOverlay.js +2 -2
- package/dist/cjs/util/ClipboardHandler.d.ts +1 -1
- package/dist/cjs/util/ClipboardHandler.js +19 -18
- package/dist/cjs/util/ReactiveValue.js +16 -12
- package/dist/cjs/util/adjustEditorThemeForContrast.js +6 -2
- package/dist/cjs/util/guessKeyCodeFromKey.js +1 -1
- package/dist/cjs/util/listenForKeyboardEventsFrom.js +8 -6
- package/dist/cjs/util/waitForAll.js +3 -3
- package/dist/cjs/util/waitForImageLoaded.js +3 -3
- package/dist/cjs/util/waitForTimeout.js +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/mjs/Editor.mjs +37 -23
- package/dist/mjs/EventDispatcher.mjs +1 -1
- package/dist/mjs/Pointer.mjs +3 -3
- package/dist/mjs/SVGLoader/SVGLoader.mjs +14 -7
- package/dist/mjs/UndoRedoHistory.mjs +1 -1
- package/dist/mjs/Viewport.mjs +4 -2
- package/dist/mjs/commands/Command.mjs +7 -5
- package/dist/mjs/commands/Duplicate.mjs +2 -2
- package/dist/mjs/commands/Erase.mjs +3 -4
- package/dist/mjs/commands/invertCommand.mjs +4 -4
- package/dist/mjs/commands/lib.d.ts +1 -1
- package/dist/mjs/commands/lib.mjs +1 -1
- package/dist/mjs/commands/uniteCommands.mjs +4 -4
- package/dist/mjs/components/AbstractComponent.d.ts +1 -1
- package/dist/mjs/components/AbstractComponent.mjs +3 -3
- package/dist/mjs/components/BackgroundComponent.mjs +10 -8
- package/dist/mjs/components/ImageComponent.mjs +12 -5
- package/dist/mjs/components/RestylableComponent.mjs +2 -2
- package/dist/mjs/components/SVGGlobalAttributesObject.mjs +1 -2
- package/dist/mjs/components/Stroke.mjs +40 -27
- package/dist/mjs/components/TextComponent.mjs +15 -12
- package/dist/mjs/components/UnknownSVGObject.mjs +2 -3
- package/dist/mjs/components/builders/ArrowBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/ArrowBuilder.mjs +9 -3
- package/dist/mjs/components/builders/CircleBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/CircleBuilder.mjs +11 -4
- package/dist/mjs/components/builders/FreehandLineBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/FreehandLineBuilder.mjs +10 -4
- package/dist/mjs/components/builders/LineBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/LineBuilder.mjs +8 -4
- package/dist/mjs/components/builders/PolylineBuilder.d.ts +4 -1
- package/dist/mjs/components/builders/PolylineBuilder.mjs +10 -6
- package/dist/mjs/components/builders/PressureSensitiveFreehandLineBuilder.mjs +17 -11
- package/dist/mjs/components/builders/RectangleBuilder.d.ts +12 -0
- package/dist/mjs/components/builders/RectangleBuilder.mjs +17 -3
- package/dist/mjs/components/builders/autocorrect/makeShapeFitAutocorrect.mjs +5 -8
- package/dist/mjs/components/builders/autocorrect/makeSnapToGridAutocorrect.mjs +1 -1
- package/dist/mjs/components/builders/lib.d.ts +7 -0
- package/dist/mjs/components/builders/lib.mjs +7 -0
- package/dist/mjs/components/lib.d.ts +1 -4
- package/dist/mjs/components/lib.mjs +2 -5
- package/dist/mjs/components/util/StrokeSmoother.mjs +5 -6
- package/dist/mjs/dialogs/makeAboutDialog.mjs +1 -1
- package/dist/mjs/dialogs/makeMessageDialog.mjs +2 -2
- package/dist/mjs/image/EditorImage.mjs +13 -15
- package/dist/mjs/image/export/editorImageToSVG.mjs +1 -1
- package/dist/mjs/inputEvents.mjs +3 -3
- package/dist/mjs/lib.d.ts +2 -2
- package/dist/mjs/lib.mjs +2 -2
- package/dist/mjs/localization.mjs +2 -2
- package/dist/mjs/localizations/de.mjs +2 -2
- package/dist/mjs/localizations/es.mjs +7 -3
- package/dist/mjs/rendering/Display.mjs +7 -3
- package/dist/mjs/rendering/RenderablePathSpec.mjs +26 -11
- package/dist/mjs/rendering/RenderingStyle.mjs +22 -15
- package/dist/mjs/rendering/TextRenderingStyle.mjs +1 -1
- package/dist/mjs/rendering/caching/CacheRecord.mjs +1 -1
- package/dist/mjs/rendering/caching/CacheRecordManager.mjs +1 -1
- package/dist/mjs/rendering/caching/RenderingCache.mjs +1 -1
- package/dist/mjs/rendering/caching/RenderingCacheNode.mjs +26 -15
- package/dist/mjs/rendering/caching/testUtils.mjs +2 -2
- package/dist/mjs/rendering/renderers/AbstractRenderer.mjs +3 -1
- package/dist/mjs/rendering/renderers/CanvasRenderer.mjs +4 -3
- package/dist/mjs/rendering/renderers/DummyRenderer.mjs +1 -1
- package/dist/mjs/rendering/renderers/SVGRenderer.mjs +38 -20
- package/dist/mjs/rendering/renderers/TextOnlyRenderer.mjs +13 -15
- package/dist/mjs/shortcuts/KeyBinding.mjs +6 -12
- package/dist/mjs/shortcuts/KeyboardShortcutManager.mjs +2 -2
- package/dist/mjs/testing/createEditor.mjs +6 -1
- package/dist/mjs/testing/findNodeWithText.d.ts +4 -1
- package/dist/mjs/testing/findNodeWithText.mjs +12 -3
- package/dist/mjs/testing/getUniquePointerId.mjs +1 -1
- package/dist/mjs/testing/sendHtmlSwipe.mjs +7 -3
- package/dist/mjs/testing/sendPenEvent.mjs +1 -3
- package/dist/mjs/testing/sendTouchEvent.mjs +1 -4
- package/dist/mjs/testing/startPinchGesture.mjs +3 -1
- package/dist/mjs/toolbar/AbstractToolbar.mjs +7 -11
- package/dist/mjs/toolbar/EdgeToolbar.mjs +11 -15
- package/dist/mjs/toolbar/IconProvider.mjs +5 -3
- package/dist/mjs/toolbar/localization.mjs +3 -3
- package/dist/mjs/toolbar/utils/HelpDisplay.mjs +8 -6
- package/dist/mjs/toolbar/utils/makeDraggable.mjs +4 -7
- package/dist/mjs/toolbar/widgets/BaseToolWidget.mjs +3 -2
- package/dist/mjs/toolbar/widgets/BaseWidget.mjs +8 -8
- package/dist/mjs/toolbar/widgets/DocumentPropertiesWidget.mjs +2 -2
- package/dist/mjs/toolbar/widgets/EraserToolWidget.mjs +5 -3
- package/dist/mjs/toolbar/widgets/HandToolWidget.mjs +8 -6
- package/dist/mjs/toolbar/widgets/InsertImageWidget/InsertImageWidget.mjs +9 -10
- package/dist/mjs/toolbar/widgets/PenToolWidget.mjs +23 -14
- package/dist/mjs/toolbar/widgets/SelectionToolWidget.mjs +2 -2
- package/dist/mjs/toolbar/widgets/TextToolWidget.mjs +5 -5
- package/dist/mjs/toolbar/widgets/components/makeFileInput.mjs +7 -7
- package/dist/mjs/toolbar/widgets/components/makeGridSelector.mjs +5 -5
- package/dist/mjs/toolbar/widgets/components/makeSnappedList.mjs +9 -5
- package/dist/mjs/toolbar/widgets/keybindings.mjs +2 -2
- package/dist/mjs/toolbar/widgets/layout/DropdownLayoutManager.mjs +6 -6
- package/dist/mjs/tools/BaseTool.mjs +6 -4
- package/dist/mjs/tools/Eraser.mjs +25 -20
- package/dist/mjs/tools/FindTool.mjs +2 -2
- package/dist/mjs/tools/InputFilter/ContextMenuRecognizer.mjs +2 -4
- package/dist/mjs/tools/InputFilter/InputMapper.mjs +1 -1
- package/dist/mjs/tools/InputFilter/InputPipeline.mjs +1 -1
- package/dist/mjs/tools/InputFilter/InputStabilizer.mjs +13 -6
- package/dist/mjs/tools/InputFilter/StrokeKeyboardControl.mjs +7 -4
- package/dist/mjs/tools/PanZoom.d.ts +1 -1
- package/dist/mjs/tools/PanZoom.mjs +18 -13
- package/dist/mjs/tools/PasteHandler.mjs +8 -2
- package/dist/mjs/tools/Pen.mjs +18 -10
- package/dist/mjs/tools/ScrollbarTool.mjs +8 -7
- package/dist/mjs/tools/SelectionTool/Selection.mjs +16 -12
- package/dist/mjs/tools/SelectionTool/SelectionHandle.mjs +5 -2
- package/dist/mjs/tools/SelectionTool/SelectionMenuShortcut.mjs +3 -1
- package/dist/mjs/tools/SelectionTool/SelectionTool.mjs +26 -17
- package/dist/mjs/tools/SelectionTool/ToPointerAutoscroller.mjs +1 -1
- package/dist/mjs/tools/SelectionTool/TransformMode.mjs +6 -7
- package/dist/mjs/tools/SelectionTool/util/makeClipboardErrorHandlers.mjs +23 -2
- package/dist/mjs/tools/SelectionTool/util/showSelectionContextMenu.mjs +29 -20
- package/dist/mjs/tools/SoundUITool.mjs +5 -3
- package/dist/mjs/tools/TextTool.mjs +8 -6
- package/dist/mjs/tools/ToolController.mjs +16 -10
- package/dist/mjs/tools/localization.d.ts +2 -0
- package/dist/mjs/tools/localization.mjs +3 -1
- package/dist/mjs/tools/util/StationaryPenDetector.mjs +3 -3
- package/dist/mjs/tools/util/createMenuOverlay.mjs +2 -2
- package/dist/mjs/util/ClipboardHandler.d.ts +1 -1
- package/dist/mjs/util/ClipboardHandler.mjs +19 -18
- package/dist/mjs/util/ReactiveValue.mjs +16 -12
- package/dist/mjs/util/adjustEditorThemeForContrast.mjs +6 -2
- package/dist/mjs/util/guessKeyCodeFromKey.mjs +1 -1
- package/dist/mjs/util/listenForKeyboardEventsFrom.mjs +8 -6
- package/dist/mjs/util/waitForAll.mjs +3 -3
- package/dist/mjs/util/waitForImageLoaded.mjs +3 -3
- package/dist/mjs/util/waitForTimeout.mjs +1 -1
- package/dist/mjs/version.mjs +1 -1
- package/package.json +88 -88
- package/src/Coloris.css +6 -6
- package/src/Editor.scss +7 -5
- package/src/dialogs/dialogs.scss +3 -4
- package/src/dialogs/makeAboutDialog.scss +2 -2
- package/src/dialogs/makeMessageDialog.scss +11 -7
- package/src/styles.js +1 -1
- package/src/toolbar/AbstractToolbar.scss +20 -12
- package/src/toolbar/DropdownToolbar.scss +5 -4
- package/src/toolbar/EdgeToolbar.scss +65 -31
- package/src/toolbar/toolbar.scss +5 -5
- package/src/toolbar/utils/HelpDisplay.scss +48 -25
- package/src/toolbar/utils/labelVisibleOnHover.scss +39 -16
- package/src/toolbar/widgets/DocumentPropertiesWidget.scss +0 -1
- package/src/toolbar/widgets/HandToolWidget.scss +0 -1
- package/src/toolbar/widgets/InsertImageWidget/InsertImageWidget.scss +2 -3
- package/src/toolbar/widgets/OverflowWidget.css +1 -2
- package/src/toolbar/widgets/PenToolWidget.scss +0 -2
- package/src/toolbar/widgets/SelectionToolWidget.scss +1 -2
- package/src/toolbar/widgets/components/components.scss +6 -6
- package/src/toolbar/widgets/components/makeColorInput.scss +0 -2
- package/src/toolbar/widgets/components/makeFileInput.scss +5 -7
- package/src/toolbar/widgets/components/makeGridSelector.scss +6 -9
- package/src/toolbar/widgets/components/makeSnappedList.scss +3 -4
- package/src/toolbar/widgets/components/makeThicknessSlider.scss +1 -2
- package/src/toolbar/widgets/widgets.scss +7 -7
- package/src/tools/FindTool.css +1 -2
- package/src/tools/ScrollbarTool.scss +9 -5
- package/src/tools/SelectionTool/SelectionTool.scss +15 -7
- package/src/tools/SelectionTool/util/makeClipboardErrorHandlers.scss +1 -2
- package/src/tools/SoundUITool.scss +4 -4
- package/src/tools/tools.scss +5 -6
- package/src/tools/util/createMenuOverlay.scss +10 -4
- package/tsconfig.json +1 -3
- package/typedoc.json +1 -1
@@ -123,9 +123,9 @@ class PanZoom extends BaseTool_1.default {
|
|
123
123
|
return { canvasCenter, screenCenter, angle, dist };
|
124
124
|
}
|
125
125
|
allPointersAreOfType(pointers, kind) {
|
126
|
-
return pointers.every(pointer => pointer.device === kind);
|
126
|
+
return pointers.every((pointer) => pointer.device === kind);
|
127
127
|
}
|
128
|
-
onPointerDown({ allPointers: pointers, current: currentPointer }) {
|
128
|
+
onPointerDown({ allPointers: pointers, current: currentPointer, }) {
|
129
129
|
let handlingGesture = false;
|
130
130
|
const inertialScrollerVelocity = this.inertialScroller?.getCurrentVelocity() ?? math_1.Vec2.zero;
|
131
131
|
this.inertialScroller?.stop();
|
@@ -147,9 +147,10 @@ class PanZoom extends BaseTool_1.default {
|
|
147
147
|
this.isRotating = Math.abs(Math.sin(this.initialViewportRotation * 2)) > 1e-3;
|
148
148
|
handlingGesture = true;
|
149
149
|
}
|
150
|
-
else if (pointers.length === 1 &&
|
151
|
-
|
152
|
-
|
150
|
+
else if (pointers.length === 1 &&
|
151
|
+
((this.mode & PanZoomMode.OneFingerTouchGestures && allAreTouch) ||
|
152
|
+
(isRightClick && this.mode & PanZoomMode.RightClickDrags) ||
|
153
|
+
this.mode & PanZoomMode.SinglePointerGestures)) {
|
153
154
|
this.lastScreenCenter = pointers[0].screenPos;
|
154
155
|
this.isScaling = false;
|
155
156
|
handlingGesture = true;
|
@@ -203,7 +204,9 @@ class PanZoom extends BaseTool_1.default {
|
|
203
204
|
// `snapToMultipleOf`.
|
204
205
|
// Use a smaller snap angle if already rotated (to avoid pinch zoom gestures from
|
205
206
|
// starting rotation).
|
206
|
-
const maxSnapAngle = this.isRotating
|
207
|
+
const maxSnapAngle = this.isRotating
|
208
|
+
? this.afterRotationStartSnapAngle
|
209
|
+
: this.initialRotationSnapAngle;
|
207
210
|
// Snap the rotation
|
208
211
|
if (Math.abs(fullRotation - roundedFullRotation) < maxSnapAngle) {
|
209
212
|
fullRotation = roundedFullRotation;
|
@@ -222,7 +225,7 @@ class PanZoom extends BaseTool_1.default {
|
|
222
225
|
*/
|
223
226
|
toSnappedScaleFactor(touchDist) {
|
224
227
|
// scaleFactor is applied to the current transformation of the viewport.
|
225
|
-
const newScale = this.initialViewportScale * touchDist / this.startTouchDist;
|
228
|
+
const newScale = (this.initialViewportScale * touchDist) / this.startTouchDist;
|
226
229
|
const currentScale = this.editor.viewport.getScaleFactor();
|
227
230
|
const logNewScale = Math.log(newScale) / Math.log(10);
|
228
231
|
const roundedLogNewScale = Math.round(logNewScale);
|
@@ -301,10 +304,10 @@ class PanZoom extends BaseTool_1.default {
|
|
301
304
|
this.velocity = math_1.Vec2.zero;
|
302
305
|
};
|
303
306
|
const minInertialScrollDt = 30;
|
304
|
-
const shouldInertialScroll = event.current.device === Pointer_1.PointerDevice.Touch
|
305
|
-
|
306
|
-
|
307
|
-
|
307
|
+
const shouldInertialScroll = event.current.device === Pointer_1.PointerDevice.Touch &&
|
308
|
+
event.allPointers.length === 1 &&
|
309
|
+
this.velocity !== null &&
|
310
|
+
event.current.timeStamp - this.lastPointerDownTimestamp > minInertialScrollDt;
|
308
311
|
if (shouldInertialScroll && this.velocity !== null) {
|
309
312
|
const oldVelocity = this.velocity;
|
310
313
|
// If the user drags the screen, then stops, then lifts the pointer,
|
@@ -444,7 +447,9 @@ class PanZoom extends BaseTool_1.default {
|
|
444
447
|
translation = toCanvas.transformVec3(translation);
|
445
448
|
// Rotate/scale about the center of the canvas
|
446
449
|
const transformCenter = this.editor.viewport.visibleRect.center;
|
447
|
-
const transformUpdate = math_1.Mat33.scaling2D(scale, transformCenter)
|
450
|
+
const transformUpdate = math_1.Mat33.scaling2D(scale, transformCenter)
|
451
|
+
.rightMul(math_1.Mat33.zRotation(rotation, transformCenter))
|
452
|
+
.rightMul(math_1.Mat33.translation(translation));
|
448
453
|
this.applyAndFinalizeTransform(transformUpdate);
|
449
454
|
return true;
|
450
455
|
}
|
@@ -90,14 +90,20 @@ class PasteHandler extends BaseTool_1.default {
|
|
90
90
|
}
|
91
91
|
return 0;
|
92
92
|
});
|
93
|
-
const defaultTextStyle = {
|
93
|
+
const defaultTextStyle = {
|
94
|
+
size: 12,
|
95
|
+
fontFamily: 'sans',
|
96
|
+
renderingStyle: { fill: math_1.Color4.red },
|
97
|
+
};
|
94
98
|
const pastedTextStyle = textTools[0]?.getTextStyle() ?? defaultTextStyle;
|
95
99
|
// Don't paste text that would be invisible.
|
96
100
|
if (text.trim() === '') {
|
97
101
|
return;
|
98
102
|
}
|
99
103
|
const lines = text.split('\n');
|
100
|
-
await this.addComponentsFromPaste([
|
104
|
+
await this.addComponentsFromPaste([
|
105
|
+
TextComponent_1.default.fromLines(lines, math_1.Mat33.identity, pastedTextStyle),
|
106
|
+
]);
|
101
107
|
}
|
102
108
|
async doImagePaste(dataURL) {
|
103
109
|
const image = new Image();
|
package/dist/cjs/tools/Pen.js
CHANGED
@@ -57,14 +57,14 @@ class Pen extends BaseTool_1.default {
|
|
57
57
|
thickness: 4,
|
58
58
|
...style,
|
59
59
|
});
|
60
|
-
this.styleValue.onUpdateAndNow(newValue => {
|
60
|
+
this.styleValue.onUpdateAndNow((newValue) => {
|
61
61
|
this.style = newValue;
|
62
62
|
this.noteUpdated();
|
63
63
|
});
|
64
64
|
}
|
65
65
|
getPressureMultiplier() {
|
66
66
|
const thickness = this.style.thickness;
|
67
|
-
return 1 / this.editor.viewport.getScaleFactor() * thickness;
|
67
|
+
return (1 / this.editor.viewport.getScaleFactor()) * thickness;
|
68
68
|
}
|
69
69
|
// Converts a `pointer` to a `StrokeDataPoint`.
|
70
70
|
toStrokePoint(pointer) {
|
@@ -123,7 +123,7 @@ class Pen extends BaseTool_1.default {
|
|
123
123
|
this.currentDeviceType = current.device;
|
124
124
|
this.currentPointerId = current.id;
|
125
125
|
if (this.shapeAutocompletionEnabled) {
|
126
|
-
this.stationaryDetector = new StationaryPenDetector_1.default(current, StationaryPenDetector_1.defaultStationaryDetectionConfig, pointer => this.autocorrectShape(pointer));
|
126
|
+
this.stationaryDetector = new StationaryPenDetector_1.default(current, StationaryPenDetector_1.defaultStationaryDetectionConfig, (pointer) => this.autocorrectShape(pointer));
|
127
127
|
}
|
128
128
|
else {
|
129
129
|
this.stationaryDetector = null;
|
@@ -303,10 +303,18 @@ class Pen extends BaseTool_1.default {
|
|
303
303
|
getStrokeAutocorrectionEnabled() {
|
304
304
|
return this.shapeAutocompletionEnabled;
|
305
305
|
}
|
306
|
-
getThickness() {
|
307
|
-
|
308
|
-
|
309
|
-
|
306
|
+
getThickness() {
|
307
|
+
return this.style.thickness;
|
308
|
+
}
|
309
|
+
getColor() {
|
310
|
+
return this.style.color;
|
311
|
+
}
|
312
|
+
getStrokeFactory() {
|
313
|
+
return this.style.factory;
|
314
|
+
}
|
315
|
+
getStyleValue() {
|
316
|
+
return this.styleValue;
|
317
|
+
}
|
310
318
|
onKeyPress(event) {
|
311
319
|
const shortcuts = this.editor.shortcuts;
|
312
320
|
// Ctrl+Z: End the stroke so that it can be undone/redone.
|
@@ -319,10 +327,10 @@ class Pen extends BaseTool_1.default {
|
|
319
327
|
}
|
320
328
|
let newThickness;
|
321
329
|
if (shortcuts.matchesShortcut(keybindings_2.decreaseSizeKeyboardShortcutId, event)) {
|
322
|
-
newThickness = this.getThickness() * 2 / 3;
|
330
|
+
newThickness = (this.getThickness() * 2) / 3;
|
323
331
|
}
|
324
332
|
else if (shortcuts.matchesShortcut(keybindings_2.increaseSizeKeyboardShortcutId, event)) {
|
325
|
-
newThickness = this.getThickness() * 3 / 2;
|
333
|
+
newThickness = (this.getThickness() * 3) / 2;
|
326
334
|
}
|
327
335
|
if (newThickness !== undefined) {
|
328
336
|
newThickness = Math.min(Math.max(1, newThickness), 256);
|
@@ -27,13 +27,13 @@ class ScrollbarTool extends BaseTool_1.default {
|
|
27
27
|
this.scrollbarOverlay.replaceChildren(this.verticalScrollbar, this.horizontalScrollbar);
|
28
28
|
let overlay = null;
|
29
29
|
let viewportListener = null;
|
30
|
-
this.enabledValue().onUpdateAndNow(enabled => {
|
30
|
+
this.enabledValue().onUpdateAndNow((enabled) => {
|
31
31
|
overlay?.remove();
|
32
32
|
viewportListener?.remove();
|
33
33
|
viewportListener = null;
|
34
34
|
overlay = null;
|
35
35
|
if (enabled) {
|
36
|
-
viewportListener = editor.notifier.on(types_1.EditorEventType.ViewportChanged, _event => {
|
36
|
+
viewportListener = editor.notifier.on(types_1.EditorEventType.ViewportChanged, (_event) => {
|
37
37
|
this.updateScrollbars();
|
38
38
|
});
|
39
39
|
this.updateScrollbars();
|
@@ -45,16 +45,17 @@ class ScrollbarTool extends BaseTool_1.default {
|
|
45
45
|
const viewport = this.editor.viewport;
|
46
46
|
const screenSize = viewport.getScreenRectSize();
|
47
47
|
const screenRect = new math_1.Rect2(0, 0, screenSize.x, screenSize.y);
|
48
|
-
const imageRect = this.editor
|
48
|
+
const imageRect = this.editor
|
49
|
+
.getImportExportRect()
|
49
50
|
// The scrollbars are positioned in screen coordinates, so the exportRect also needs
|
50
51
|
// to be in screen coordinates
|
51
52
|
.transformedBoundingBox(viewport.canvasToScreenTransform)
|
52
53
|
// If the screenRect is outside of the exportRect, expand the image rectangle
|
53
54
|
.union(screenRect);
|
54
|
-
const scrollbarWidth = screenRect.width / imageRect.width * screenSize.x;
|
55
|
-
const scrollbarHeight = screenRect.height / imageRect.height * screenSize.y;
|
56
|
-
const scrollbarX = (screenRect.x - imageRect.x) / imageRect.width *
|
57
|
-
const scrollbarY = (screenRect.y - imageRect.y) / imageRect.height *
|
55
|
+
const scrollbarWidth = (screenRect.width / imageRect.width) * screenSize.x;
|
56
|
+
const scrollbarHeight = (screenRect.height / imageRect.height) * screenSize.y;
|
57
|
+
const scrollbarX = ((screenRect.x - imageRect.x) / imageRect.width) * screenSize.x;
|
58
|
+
const scrollbarY = ((screenRect.y - imageRect.y) / imageRect.height) * screenSize.y;
|
58
59
|
this.horizontalScrollbar.style.width = `${scrollbarWidth}px`;
|
59
60
|
this.verticalScrollbar.style.height = `${scrollbarHeight}px`;
|
60
61
|
this.horizontalScrollbar.style.marginLeft = `${scrollbarX}px`;
|
@@ -175,7 +175,7 @@ class Selection {
|
|
175
175
|
const selectedBottommostZIndex = this.selectedElems[0].getZIndex();
|
176
176
|
const visibleObjects = this.editor.image.getElementsIntersectingRegion(this.region);
|
177
177
|
const topMostVisibleZIndex = visibleObjects[visibleObjects.length - 1]?.getZIndex() ?? selectedBottommostZIndex;
|
178
|
-
const deltaZIndex =
|
178
|
+
const deltaZIndex = topMostVisibleZIndex + 1 - selectedBottommostZIndex;
|
179
179
|
return deltaZIndex;
|
180
180
|
}
|
181
181
|
// Applies the current transformation to the selection
|
@@ -205,7 +205,7 @@ class Selection {
|
|
205
205
|
const targetHighestZIndex = lowestVisibleZIndex - 1;
|
206
206
|
const deltaZIndex = targetHighestZIndex - highestSelectedZIndex;
|
207
207
|
if (deltaZIndex !== 0) {
|
208
|
-
const commands = this.selectedElems.map(elem => {
|
208
|
+
const commands = this.selectedElems.map((elem) => {
|
209
209
|
return elem.setZIndex(elem.getZIndex() + deltaZIndex);
|
210
210
|
});
|
211
211
|
return (0, uniteCommands_1.default)(commands, updateChunkSize);
|
@@ -246,7 +246,9 @@ class Selection {
|
|
246
246
|
// Only select one item if the rectangle was very small.
|
247
247
|
singleItemSelectionMode = true;
|
248
248
|
}
|
249
|
-
this.selectedElems = this.editor.image
|
249
|
+
this.selectedElems = this.editor.image
|
250
|
+
.getElementsIntersectingRegion(this.region)
|
251
|
+
.filter((elem) => {
|
250
252
|
return elem.intersectsRect(this.region) && elem.isSelectable();
|
251
253
|
});
|
252
254
|
if (singleItemSelectionMode && this.selectedElems.length > 0) {
|
@@ -304,7 +306,7 @@ class Selection {
|
|
304
306
|
this.backgroundElem.style.marginTop = `${screenRegion.topLeft.y}px`;
|
305
307
|
this.backgroundElem.style.width = `${screenRegion.width}px`;
|
306
308
|
this.backgroundElem.style.height = `${screenRegion.height}px`;
|
307
|
-
const rotationDeg = this.screenRegionRotation * 180 / Math.PI;
|
309
|
+
const rotationDeg = (this.screenRegionRotation * 180) / Math.PI;
|
308
310
|
this.backgroundElem.style.transform = `rotate(${rotationDeg}deg)`;
|
309
311
|
this.backgroundElem.style.transformOrigin = 'center';
|
310
312
|
// If closer to perpendicular, apply different CSS
|
@@ -371,7 +373,7 @@ class Selection {
|
|
371
373
|
}
|
372
374
|
removeDeletedElemsFromSelection() {
|
373
375
|
// Remove any deleted elements from the selection.
|
374
|
-
this.selectedElems = this.selectedElems.filter(elem => {
|
376
|
+
this.selectedElems = this.selectedElems.filter((elem) => {
|
375
377
|
const hasParent = !!this.editor.image.findParent(elem);
|
376
378
|
// If we removed the element and haven't added it back yet, don't remove it
|
377
379
|
// from the selection.
|
@@ -532,7 +534,7 @@ class Selection {
|
|
532
534
|
this.addRemoveSelectionFromImage(true);
|
533
535
|
this.originalRegion = bbox;
|
534
536
|
this.selectionTightBoundingBox = bbox;
|
535
|
-
this.selectedElems = objects.filter(object => object.isSelectable());
|
537
|
+
this.selectedElems = objects.filter((object) => object.isSelectable());
|
536
538
|
// Enforce increasing z-index invariant
|
537
539
|
this.selectedElems.sort((a, b) => a.getZIndex() - b.getZIndex());
|
538
540
|
this.padRegion();
|
@@ -547,7 +549,7 @@ _a = Selection;
|
|
547
549
|
SerializableCommand_1.default.register('selection-tool-transform', (json, _editor) => {
|
548
550
|
// The selection box is lost when serializing/deserializing. No need to store box rotation
|
549
551
|
const fullTransform = new math_1.Mat33(...json.transform);
|
550
|
-
const elemIds =
|
552
|
+
const elemIds = json.elems ?? [];
|
551
553
|
const deltaZIndex = parseInt(json.deltaZIndex ?? 0);
|
552
554
|
return new _a.ApplyTransformationCommand(null, elemIds, fullTransform, deltaZIndex);
|
553
555
|
});
|
@@ -570,8 +572,8 @@ Selection.ApplyTransformationCommand = class extends SerializableCommand_1.defau
|
|
570
572
|
this.selectedElemIds = selectedElems;
|
571
573
|
}
|
572
574
|
else {
|
573
|
-
this.selectedElemIds = selectedElems.map(elem => elem.getId());
|
574
|
-
this.transformCommands = selectedElems.map(elem => {
|
575
|
+
this.selectedElemIds = selectedElems.map((elem) => elem.getId());
|
576
|
+
this.transformCommands = selectedElems.map((elem) => {
|
575
577
|
return elem.setZIndexAndTransformBy(this.fullTransform, elem.getZIndex() + deltaZIndex);
|
576
578
|
});
|
577
579
|
}
|
@@ -580,7 +582,8 @@ Selection.ApplyTransformationCommand = class extends SerializableCommand_1.defau
|
|
580
582
|
if (this.transformCommands) {
|
581
583
|
return;
|
582
584
|
}
|
583
|
-
this.transformCommands = this.selectedElemIds
|
585
|
+
this.transformCommands = this.selectedElemIds
|
586
|
+
.map((id) => {
|
584
587
|
const elem = editor.image.lookupElement(id);
|
585
588
|
if (!elem) {
|
586
589
|
// There may be valid reasons for an element lookup to fail:
|
@@ -598,9 +601,10 @@ Selection.ApplyTransformationCommand = class extends SerializableCommand_1.defau
|
|
598
601
|
originalZIndex = elem.getZIndex() - this.deltaZIndex;
|
599
602
|
}
|
600
603
|
return elem.setZIndexAndTransformBy(this.fullTransform, targetZIndex, originalZIndex);
|
601
|
-
})
|
604
|
+
})
|
605
|
+
.filter(
|
602
606
|
// Remove all null commands
|
603
|
-
command => command !== null);
|
607
|
+
(command) => command !== null);
|
604
608
|
}
|
605
609
|
async apply(editor) {
|
606
610
|
this.resolveToElems(editor, false);
|
@@ -68,7 +68,9 @@ class SelectionHandle {
|
|
68
68
|
* Removes this element from its container. Should only be called
|
69
69
|
* after {@link addTo}.
|
70
70
|
*/
|
71
|
-
remove() {
|
71
|
+
remove() {
|
72
|
+
this.element.remove();
|
73
|
+
}
|
72
74
|
/**
|
73
75
|
* Returns this handle's bounding box relative to the top left of the
|
74
76
|
* selection box.
|
@@ -76,7 +78,8 @@ class SelectionHandle {
|
|
76
78
|
getBBoxParentCoords() {
|
77
79
|
const parentRect = this.parent.getScreenRegion();
|
78
80
|
const size = math_1.Vec2.of(exports.handleSize, exports.handleSize);
|
79
|
-
const topLeft = parentRect.size
|
81
|
+
const topLeft = parentRect.size
|
82
|
+
.scale(this.parentSide)
|
80
83
|
// Center
|
81
84
|
.minus(size.times(1 / 2));
|
82
85
|
return new math_1.Rect2(topLeft.x, topLeft.y, size.x, size.y);
|
@@ -41,7 +41,9 @@ class SelectionMenuShortcut {
|
|
41
41
|
addTo(container) {
|
42
42
|
container.appendChild(this.element);
|
43
43
|
}
|
44
|
-
remove() {
|
44
|
+
remove() {
|
45
|
+
this.element.remove();
|
46
|
+
}
|
45
47
|
getElementScreenSize() {
|
46
48
|
return math_1.Vec2.of(this.element.clientWidth, this.element.clientHeight);
|
47
49
|
}
|
@@ -53,7 +53,7 @@ class SelectionTool extends BaseTool_1.default {
|
|
53
53
|
editor.createHTMLOverlay(this.handleOverlay);
|
54
54
|
this.handleOverlay.style.display = 'none';
|
55
55
|
this.handleOverlay.classList.add('handleOverlay');
|
56
|
-
editor.notifier.on(types_1.EditorEventType.ViewportChanged, _data => {
|
56
|
+
editor.notifier.on(types_1.EditorEventType.ViewportChanged, (_data) => {
|
57
57
|
// The selection box could be using the wet ink display if its transformation
|
58
58
|
// hasn't been finalized yet. Clear before updating the UI.
|
59
59
|
this.editor.clearWetInk();
|
@@ -88,7 +88,9 @@ class SelectionTool extends BaseTool_1.default {
|
|
88
88
|
this.selectionBox.finalizeTransform();
|
89
89
|
}
|
90
90
|
onContextMenu(event) {
|
91
|
-
const canShowSelectionMenu = this.selectionBox
|
91
|
+
const canShowSelectionMenu = this.selectionBox
|
92
|
+
?.getScreenRegion()
|
93
|
+
?.containsPoint(event.screenPos);
|
92
94
|
void this.showContextMenu(event.canvasPos, canShowSelectionMenu);
|
93
95
|
return true;
|
94
96
|
}
|
@@ -202,8 +204,8 @@ class SelectionTool extends BaseTool_1.default {
|
|
202
204
|
onSelectionUpdated() {
|
203
205
|
const selectedItemCount = this.selectionBox?.getSelectedItemCount() ?? 0;
|
204
206
|
const selectedObjects = this.selectionBox?.getSelectedObjects() ?? [];
|
205
|
-
const hasDifferentSelection = this.lastSelectedObjects.length !== selectedItemCount
|
206
|
-
|
207
|
+
const hasDifferentSelection = this.lastSelectedObjects.length !== selectedItemCount ||
|
208
|
+
selectedObjects.some((obj, i) => this.lastSelectedObjects[i] !== obj);
|
207
209
|
if (hasDifferentSelection) {
|
208
210
|
this.lastSelectedObjects = selectedObjects;
|
209
211
|
// Note that the selection has changed
|
@@ -240,8 +242,9 @@ class SelectionTool extends BaseTool_1.default {
|
|
240
242
|
this.snapToGrid = true;
|
241
243
|
return true;
|
242
244
|
}
|
243
|
-
if (this.selectionBox &&
|
244
|
-
|
245
|
+
if (this.selectionBox &&
|
246
|
+
(shortcucts.matchesShortcut(keybindings_1.duplicateSelectionShortcut, event) ||
|
247
|
+
shortcucts.matchesShortcut(keybindings_1.sendToBackSelectionShortcut, event))) {
|
245
248
|
// Handle duplication on key up — we don't want to accidentally duplicate
|
246
249
|
// many times.
|
247
250
|
return true;
|
@@ -304,11 +307,11 @@ class SelectionTool extends BaseTool_1.default {
|
|
304
307
|
xScaleSteps += 1;
|
305
308
|
yScaleSteps += 1;
|
306
309
|
}
|
307
|
-
let handled = xTranslateSteps !== 0
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
310
|
+
let handled = xTranslateSteps !== 0 ||
|
311
|
+
yTranslateSteps !== 0 ||
|
312
|
+
rotationSteps !== 0 ||
|
313
|
+
xScaleSteps !== 0 ||
|
314
|
+
yScaleSteps !== 0;
|
312
315
|
if (!this.selectionBox) {
|
313
316
|
handled = false;
|
314
317
|
}
|
@@ -319,9 +322,13 @@ class SelectionTool extends BaseTool_1.default {
|
|
319
322
|
const region = this.selectionBox.region;
|
320
323
|
const scaleFactor = math_1.Vec2.of(scaleStepSize ** xScaleSteps, scaleStepSize ** yScaleSteps);
|
321
324
|
const rotationMat = math_1.Mat33.zRotation(rotationSteps * rotateStepSize);
|
322
|
-
const roundedRotationMatrix = rotationMat.mapEntries(component => Viewport_1.default.roundScaleRatio(component));
|
325
|
+
const roundedRotationMatrix = rotationMat.mapEntries((component) => Viewport_1.default.roundScaleRatio(component));
|
323
326
|
const regionCenter = this.editor.viewport.roundPoint(region.center);
|
324
|
-
const transform = math_1.Mat33.scaling2D(scaleFactor, this.editor.viewport.roundPoint(region.topLeft))
|
327
|
+
const transform = math_1.Mat33.scaling2D(scaleFactor, this.editor.viewport.roundPoint(region.topLeft))
|
328
|
+
.rightMul(math_1.Mat33.translation(regionCenter)
|
329
|
+
.rightMul(roundedRotationMatrix)
|
330
|
+
.rightMul(math_1.Mat33.translation(regionCenter.times(-1))))
|
331
|
+
.rightMul(math_1.Mat33.translation(this.editor.viewport.roundPoint(math_1.Vec2.of(xTranslateSteps, yTranslateSteps).times(translateStepSize))));
|
325
332
|
const oldTransform = this.selectionBox.getTransform();
|
326
333
|
this.selectionBox.setTransform(oldTransform.rightMul(transform));
|
327
334
|
this.selectionBox.scrollTo();
|
@@ -347,7 +354,7 @@ class SelectionTool extends BaseTool_1.default {
|
|
347
354
|
}
|
348
355
|
if (this.selectionBox && shortcucts.matchesShortcut(keybindings_1.duplicateSelectionShortcut, evt)) {
|
349
356
|
// Finalize duplicating the selection
|
350
|
-
this.selectionBox.duplicateSelectedObjects().then(command => {
|
357
|
+
this.selectionBox.duplicateSelectedObjects().then((command) => {
|
351
358
|
this.editor.dispatch(command);
|
352
359
|
});
|
353
360
|
return true;
|
@@ -392,7 +399,9 @@ class SelectionTool extends BaseTool_1.default {
|
|
392
399
|
return false;
|
393
400
|
}
|
394
401
|
const exportViewport = new Viewport_1.default(() => { });
|
395
|
-
const selectionScreenSize = this.selectionBox
|
402
|
+
const selectionScreenSize = this.selectionBox
|
403
|
+
.getScreenRegion()
|
404
|
+
.size.times(this.editor.display.getDevicePixelRatio());
|
396
405
|
// Update the viewport to have screen size roughly equal to the size of the selection box
|
397
406
|
let scaleFactor = selectionScreenSize.maximumEntryMagnitude() / (bbox.size.maximumEntryMagnitude() || 1);
|
398
407
|
// Round to a nearby power of two
|
@@ -461,7 +470,7 @@ class SelectionTool extends BaseTool_1.default {
|
|
461
470
|
// Select the given `objects`. Any non-selectable objects in `objects` are ignored.
|
462
471
|
setSelection(objects) {
|
463
472
|
// Only select selectable objects.
|
464
|
-
objects = objects.filter(obj => obj.isSelectable());
|
473
|
+
objects = objects.filter((obj) => obj.isSelectable());
|
465
474
|
// Sort by z-index
|
466
475
|
objects.sort((a, b) => a.getZIndex() - b.getZIndex());
|
467
476
|
// Remove duplicates
|
@@ -68,7 +68,7 @@ class ToPointerAutoscroller {
|
|
68
68
|
const currentTime = performance.now();
|
69
69
|
const deltaTimeMs = currentTime - lastUpdateTime;
|
70
70
|
const scrollDirection = this.getScrollForPoint(this.targetPoint);
|
71
|
-
const screenScrollAmount = scrollDirection.times(this.scrollRate * deltaTimeMs / 1000);
|
71
|
+
const screenScrollAmount = scrollDirection.times((this.scrollRate * deltaTimeMs) / 1000);
|
72
72
|
this.scrollByCanvasDelta(this.viewport.screenToCanvasTransform.transformVec3(screenScrollAmount));
|
73
73
|
lastUpdateTime = currentTime;
|
74
74
|
await (0, untilNextAnimationFrame_1.default)();
|
@@ -82,7 +82,7 @@ class ResizeTransformer {
|
|
82
82
|
}
|
83
83
|
// Round: If this isn't done, scaling can create numbers with long decimal representations.
|
84
84
|
// long decimal representations => large file sizes.
|
85
|
-
scale = scale.map(component => Viewport_1.default.roundScaleRatio(component, 2));
|
85
|
+
scale = scale.map((component) => Viewport_1.default.roundScaleRatio(component, 2));
|
86
86
|
if (scale.x !== 0 && scale.y !== 0) {
|
87
87
|
const origin = this.editor.viewport.roundPoint(this.transformOrigin);
|
88
88
|
this.selection.setTransform(math_1.Mat33.scaling2D(scale, origin));
|
@@ -124,9 +124,8 @@ class RotateTransformer {
|
|
124
124
|
// Transform in canvas space
|
125
125
|
const canvasSelCenter = this.editor.viewport.roundPoint(this.selection.preTransformRegion.center);
|
126
126
|
const unrounded = math_1.Mat33.zRotation(angle);
|
127
|
-
const roundedRotationTransform = unrounded.mapEntries(entry => Viewport_1.default.roundScaleRatio(entry));
|
128
|
-
const fullRoundedTransform = math_1.Mat33
|
129
|
-
.translation(canvasSelCenter)
|
127
|
+
const roundedRotationTransform = unrounded.mapEntries((entry) => Viewport_1.default.roundScaleRatio(entry));
|
128
|
+
const fullRoundedTransform = math_1.Mat33.translation(canvasSelCenter)
|
130
129
|
.rightMul(roundedRotationTransform)
|
131
130
|
.rightMul(math_1.Mat33.translation(canvasSelCenter.times(-1)));
|
132
131
|
this.selection.setTransform(fullRoundedTransform);
|
@@ -144,9 +143,9 @@ class RotateTransformer {
|
|
144
143
|
const clickThresholdDist = 10;
|
145
144
|
const clickThresholdTime = 0.4; // s
|
146
145
|
const dragTimeSeconds = (performance.now() - this.startTime) / 1000;
|
147
|
-
if (dragTimeSeconds < clickThresholdTime
|
148
|
-
|
149
|
-
|
146
|
+
if (dragTimeSeconds < clickThresholdTime &&
|
147
|
+
this.maximumDistFromStart < clickThresholdDist &&
|
148
|
+
this.targetRotation === 0) {
|
150
149
|
this.setRotationTo(-Math.PI / 2);
|
151
150
|
}
|
152
151
|
return this.selection.finalizeTransform();
|
@@ -9,7 +9,7 @@ const makeClipboardErrorHandlers = (editor) => {
|
|
9
9
|
const makeErrorDialog = (error) => {
|
10
10
|
const dialog = (0, makeMessageDialog_1.default)(editor, {
|
11
11
|
title: editor.localization.copyPasteError__heading,
|
12
|
-
classNames: ['clipboard-error-dialog']
|
12
|
+
classNames: ['clipboard-error-dialog'],
|
13
13
|
});
|
14
14
|
dialog.appendChild(document.createTextNode(editor.localization.copyPasteError__description));
|
15
15
|
const errorDetailsElement = document.createElement('details');
|
@@ -22,7 +22,26 @@ const makeClipboardErrorHandlers = (editor) => {
|
|
22
22
|
};
|
23
23
|
return {
|
24
24
|
async onCopyError(error) {
|
25
|
-
makeErrorDialog(error);
|
25
|
+
const dialog = makeErrorDialog(error);
|
26
|
+
const textboxLabel = document.createElement('label');
|
27
|
+
textboxLabel.textContent = editor.localization.copyPasteError__copyRetry;
|
28
|
+
const copyTextbox = document.createElement('textarea');
|
29
|
+
textboxLabel.appendChild(copyTextbox);
|
30
|
+
const retryHandler = new ClipboardHandler_1.default(editor);
|
31
|
+
const handleCopy = (event) => {
|
32
|
+
event.preventDefault();
|
33
|
+
// Use .then to ensure that .copy runs within the event handler.
|
34
|
+
// Copy can fail if certain logic is run async.
|
35
|
+
return retryHandler.copy(event).then(() => {
|
36
|
+
dialog.close();
|
37
|
+
});
|
38
|
+
};
|
39
|
+
copyTextbox.oncopy = handleCopy;
|
40
|
+
copyTextbox.ondragstart = handleCopy;
|
41
|
+
copyTextbox.value = editor.localization.copyPasteError__copyMe;
|
42
|
+
dialog.appendChild(textboxLabel);
|
43
|
+
copyTextbox.select();
|
44
|
+
document.execCommand('copy');
|
26
45
|
},
|
27
46
|
onPasteError(error) {
|
28
47
|
const dialog = makeErrorDialog(error);
|
@@ -44,6 +63,8 @@ const makeClipboardErrorHandlers = (editor) => {
|
|
44
63
|
pasteTextbox.onpaste = handlePaste;
|
45
64
|
pasteTextbox.ondrop = handlePaste;
|
46
65
|
dialog.appendChild(textboxLabel);
|
66
|
+
pasteTextbox.focus();
|
67
|
+
document.execCommand('paste');
|
47
68
|
},
|
48
69
|
};
|
49
70
|
};
|
@@ -9,35 +9,44 @@ const makeClipboardErrorHandlers_1 = __importDefault(require("./makeClipboardErr
|
|
9
9
|
const showSelectionContextMenu = async (selectionBox, editor, canvasAnchor, preferSelectionMenu, clearSelection) => {
|
10
10
|
const localization = editor.localization;
|
11
11
|
const showSelectionMenu = selectionBox?.getSelectedItemCount() && preferSelectionMenu;
|
12
|
-
const noSelectionMenu = [
|
12
|
+
const noSelectionMenu = [
|
13
|
+
{
|
13
14
|
text: localization.selectionMenu__paste,
|
14
15
|
icon: () => editor.icons.makePasteIcon(),
|
15
16
|
key: () => {
|
16
17
|
const clipboardHandler = new ClipboardHandler_1.default(editor, (0, makeClipboardErrorHandlers_1.default)(editor));
|
17
18
|
void clipboardHandler.paste();
|
18
19
|
},
|
19
|
-
}
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
20
|
+
},
|
21
|
+
];
|
22
|
+
const onActivated = await (0, createMenuOverlay_1.default)(editor, canvasAnchor, showSelectionMenu
|
23
|
+
? [
|
24
|
+
{
|
25
|
+
text: localization.selectionMenu__duplicate,
|
26
|
+
icon: () => editor.icons.makeDuplicateSelectionIcon(),
|
27
|
+
key: async () => {
|
28
|
+
await editor.dispatch(await selectionBox.duplicateSelectedObjects());
|
29
|
+
},
|
25
30
|
},
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
31
|
+
{
|
32
|
+
text: localization.selectionMenu__delete,
|
33
|
+
icon: () => editor.icons.makeDeleteSelectionIcon(),
|
34
|
+
key: async () => {
|
35
|
+
await editor.dispatch(selectionBox.deleteSelectedObjects());
|
36
|
+
clearSelection();
|
37
|
+
},
|
32
38
|
},
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
+
{
|
40
|
+
text: localization.selectionMenu__copyToClipboard,
|
41
|
+
icon: () => editor.icons.makeCopyIcon(),
|
42
|
+
key: () => {
|
43
|
+
const clipboardHandler = new ClipboardHandler_1.default(editor, (0, makeClipboardErrorHandlers_1.default)(editor));
|
44
|
+
void clipboardHandler.copy();
|
45
|
+
},
|
39
46
|
},
|
40
|
-
|
47
|
+
...noSelectionMenu,
|
48
|
+
]
|
49
|
+
: noSelectionMenu);
|
41
50
|
onActivated?.();
|
42
51
|
};
|
43
52
|
exports.default = showSelectionContextMenu;
|
@@ -58,12 +58,12 @@ class SoundFeedback {
|
|
58
58
|
setColor(color) {
|
59
59
|
const hsv = color.asHSV();
|
60
60
|
// Choose frequencies that roughly correspond to hue, saturation, and value.
|
61
|
-
const hueFrequency =
|
61
|
+
const hueFrequency = -Math.cos(hsv.x / 2) * 220 + 440;
|
62
62
|
const saturationFrequency = hsv.y * 440 + 220;
|
63
63
|
const valueFrequency = (hsv.z + 0.1) * 440;
|
64
64
|
// Sigmoid with maximum 0.25 * alpha.
|
65
65
|
// Louder for greater value.
|
66
|
-
const gain = 0.25 * Math.min(1, color.a) / (1 + Math.exp(-(hsv.z - 0.5) * 3));
|
66
|
+
const gain = (0.25 * Math.min(1, color.a)) / (1 + Math.exp(-(hsv.z - 0.5) * 3));
|
67
67
|
this.colorOscHue.frequency.setValueAtTime(hueFrequency, this.ctx.currentTime);
|
68
68
|
this.colorOscSaturation.frequency.setValueAtTime(saturationFrequency, this.ctx.currentTime);
|
69
69
|
this.colorOscValue.frequency.setValueAtTime(valueFrequency, this.ctx.currentTime);
|
@@ -155,7 +155,9 @@ class SoundUITool extends BaseTool_1.default {
|
|
155
155
|
onPointerMove({ current }) {
|
156
156
|
this.soundFeedback?.setColor(this.editor.display.getColorAt(current.screenPos) ?? math_1.Color4.black);
|
157
157
|
const pointerMotionLine = new math_1.LineSegment2(this.lastPointerPos, current.canvasPos);
|
158
|
-
const collisions = this.editor.image
|
158
|
+
const collisions = this.editor.image
|
159
|
+
.getElementsIntersectingRegion(pointerMotionLine.bbox)
|
160
|
+
.filter((component) => component.intersects(pointerMotionLine));
|
159
161
|
this.lastPointerPos = current.canvasPos;
|
160
162
|
if (collisions.length > 0) {
|
161
163
|
this.soundFeedback?.announceBoundaryCross(collisions.length);
|