js-draw 1.21.2 → 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.d.ts +61 -0
- package/dist/cjs/tools/BaseTool.js +181 -0
- package/dist/cjs/tools/Eraser.d.ts +60 -0
- package/dist/cjs/tools/Eraser.js +304 -0
- package/dist/cjs/tools/Eraser.test.d.ts +1 -0
- package/dist/cjs/tools/FindTool.d.ts +21 -0
- package/dist/cjs/tools/FindTool.js +137 -0
- package/dist/cjs/tools/FindTool.test.d.ts +1 -0
- package/dist/cjs/tools/InputFilter/ContextMenuRecognizer.d.ts +17 -0
- package/dist/cjs/tools/InputFilter/ContextMenuRecognizer.js +103 -0
- package/dist/cjs/tools/InputFilter/ContextMenuRecognizer.test.d.ts +1 -0
- package/dist/cjs/tools/InputFilter/FunctionMapper.d.ts +12 -0
- package/dist/cjs/tools/InputFilter/FunctionMapper.js +21 -0
- package/dist/cjs/tools/InputFilter/InputMapper.d.ts +23 -0
- package/dist/cjs/tools/InputFilter/InputMapper.js +38 -0
- package/dist/cjs/tools/InputFilter/InputPipeline.d.ts +15 -0
- package/dist/cjs/tools/InputFilter/InputPipeline.js +54 -0
- package/dist/cjs/tools/InputFilter/InputPipeline.test.d.ts +1 -0
- package/dist/cjs/tools/InputFilter/InputStabilizer.d.ts +29 -0
- package/dist/cjs/tools/InputFilter/InputStabilizer.js +188 -0
- package/dist/cjs/tools/InputFilter/StrokeKeyboardControl.d.ts +21 -0
- package/dist/cjs/tools/InputFilter/StrokeKeyboardControl.js +87 -0
- package/dist/cjs/tools/PanZoom.d.ts +125 -0
- package/dist/cjs/tools/PanZoom.js +522 -0
- package/dist/cjs/tools/PanZoom.test.d.ts +1 -0
- package/dist/cjs/tools/PasteHandler.d.ts +23 -0
- package/dist/cjs/tools/PasteHandler.js +115 -0
- package/dist/cjs/tools/Pen.d.ts +54 -0
- package/dist/cjs/tools/Pen.js +343 -0
- package/dist/cjs/tools/Pen.test.d.ts +1 -0
- package/dist/cjs/tools/PipetteTool.d.ts +28 -0
- package/dist/cjs/tools/PipetteTool.js +69 -0
- package/dist/cjs/tools/ScrollbarTool.d.ts +18 -0
- package/dist/cjs/tools/ScrollbarTool.js +86 -0
- package/dist/cjs/tools/SelectionTool/SelectAllShortcutHandler.d.ts +9 -0
- package/dist/cjs/tools/SelectionTool/SelectAllShortcutHandler.js +32 -0
- package/dist/cjs/tools/SelectionTool/Selection.d.ts +72 -0
- package/dist/cjs/tools/SelectionTool/Selection.js +638 -0
- package/dist/cjs/tools/SelectionTool/SelectionHandle.d.ts +62 -0
- package/dist/cjs/tools/SelectionTool/SelectionHandle.js +144 -0
- package/dist/cjs/tools/SelectionTool/SelectionMenuShortcut.d.ts +32 -0
- package/dist/cjs/tools/SelectionTool/SelectionMenuShortcut.js +88 -0
- package/dist/cjs/tools/SelectionTool/SelectionTool.d.ts +42 -0
- package/dist/cjs/tools/SelectionTool/SelectionTool.js +509 -0
- package/dist/cjs/tools/SelectionTool/SelectionTool.selecting.test.d.ts +1 -0
- package/dist/cjs/tools/SelectionTool/SelectionTool.test.d.ts +1 -0
- package/dist/cjs/tools/SelectionTool/ToPointerAutoscroller.d.ts +23 -0
- package/dist/cjs/tools/SelectionTool/ToPointerAutoscroller.js +83 -0
- package/dist/cjs/tools/SelectionTool/TransformMode.d.ts +42 -0
- package/dist/cjs/tools/SelectionTool/TransformMode.js +154 -0
- package/dist/cjs/tools/SelectionTool/keybindings.d.ts +15 -0
- package/dist/cjs/tools/SelectionTool/keybindings.js +38 -0
- package/dist/cjs/tools/SelectionTool/types.d.ts +35 -0
- package/dist/cjs/tools/SelectionTool/types.js +14 -0
- package/dist/cjs/tools/SelectionTool/util/makeClipboardErrorHandlers.d.ts +6 -0
- package/dist/cjs/tools/SelectionTool/util/makeClipboardErrorHandlers.js +71 -0
- package/dist/cjs/tools/SelectionTool/util/showSelectionContextMenu.d.ts +5 -0
- package/dist/cjs/tools/SelectionTool/util/showSelectionContextMenu.js +52 -0
- package/dist/cjs/tools/SoundUITool.d.ts +26 -0
- package/dist/cjs/tools/SoundUITool.js +173 -0
- package/dist/cjs/tools/TextTool.d.ts +36 -0
- package/dist/cjs/tools/TextTool.js +287 -0
- package/dist/cjs/tools/TextTool.test.d.ts +1 -0
- package/dist/cjs/tools/ToolController.d.ts +73 -0
- package/dist/cjs/tools/ToolController.js +310 -0
- package/dist/cjs/tools/ToolController.test.d.ts +1 -0
- package/dist/cjs/tools/ToolEnabledGroup.d.ts +6 -0
- package/dist/cjs/tools/ToolEnabledGroup.js +13 -0
- package/dist/cjs/tools/ToolSwitcherShortcut.d.ts +16 -0
- package/dist/cjs/tools/ToolSwitcherShortcut.js +40 -0
- package/dist/cjs/tools/ToolbarShortcutHandler.d.ts +12 -0
- package/dist/cjs/tools/ToolbarShortcutHandler.js +34 -0
- package/dist/cjs/tools/UndoRedoShortcut.d.ts +8 -0
- package/dist/cjs/tools/UndoRedoShortcut.js +27 -0
- package/dist/cjs/tools/UndoRedoShortcut.test.d.ts +1 -0
- package/dist/cjs/tools/keybindings.d.ts +16 -0
- package/dist/cjs/tools/keybindings.js +58 -0
- package/dist/cjs/tools/lib.d.ts +14 -0
- package/dist/cjs/tools/lib.js +36 -0
- package/dist/cjs/tools/localization.d.ts +45 -0
- package/dist/cjs/tools/localization.js +47 -0
- package/dist/cjs/tools/util/StationaryPenDetector.d.ts +25 -0
- package/dist/cjs/tools/util/StationaryPenDetector.js +107 -0
- package/dist/cjs/tools/util/createMenuOverlay.d.ts +10 -0
- package/dist/cjs/tools/util/createMenuOverlay.js +126 -0
- package/dist/cjs/tools/util/createMenuOverlay.test.d.ts +1 -0
- 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.d.ts +61 -0
- package/dist/mjs/tools/BaseTool.mjs +179 -0
- package/dist/mjs/tools/Eraser.d.ts +60 -0
- package/dist/mjs/tools/Eraser.mjs +297 -0
- package/dist/mjs/tools/Eraser.test.d.ts +1 -0
- package/dist/mjs/tools/FindTool.d.ts +21 -0
- package/dist/mjs/tools/FindTool.mjs +131 -0
- package/dist/mjs/tools/FindTool.test.d.ts +1 -0
- package/dist/mjs/tools/InputFilter/ContextMenuRecognizer.d.ts +17 -0
- package/dist/mjs/tools/InputFilter/ContextMenuRecognizer.mjs +74 -0
- package/dist/mjs/tools/InputFilter/ContextMenuRecognizer.test.d.ts +1 -0
- package/dist/mjs/tools/InputFilter/FunctionMapper.d.ts +12 -0
- package/dist/mjs/tools/InputFilter/FunctionMapper.mjs +15 -0
- package/dist/mjs/tools/InputFilter/InputMapper.d.ts +23 -0
- package/dist/mjs/tools/InputFilter/InputMapper.mjs +36 -0
- package/dist/mjs/tools/InputFilter/InputPipeline.d.ts +15 -0
- package/dist/mjs/tools/InputFilter/InputPipeline.mjs +49 -0
- package/dist/mjs/tools/InputFilter/InputPipeline.test.d.ts +1 -0
- package/dist/mjs/tools/InputFilter/InputStabilizer.d.ts +29 -0
- package/dist/mjs/tools/InputFilter/InputStabilizer.mjs +182 -0
- package/dist/mjs/tools/InputFilter/StrokeKeyboardControl.d.ts +21 -0
- package/dist/mjs/tools/InputFilter/StrokeKeyboardControl.mjs +81 -0
- package/dist/mjs/tools/PanZoom.d.ts +125 -0
- package/dist/mjs/tools/PanZoom.mjs +515 -0
- package/dist/mjs/tools/PanZoom.test.d.ts +1 -0
- package/dist/mjs/tools/PasteHandler.d.ts +23 -0
- package/dist/mjs/tools/PasteHandler.mjs +109 -0
- package/dist/mjs/tools/Pen.d.ts +54 -0
- package/dist/mjs/tools/Pen.mjs +314 -0
- package/dist/mjs/tools/Pen.test.d.ts +1 -0
- package/dist/mjs/tools/PipetteTool.d.ts +28 -0
- package/dist/mjs/tools/PipetteTool.mjs +63 -0
- package/dist/mjs/tools/ScrollbarTool.d.ts +18 -0
- package/dist/mjs/tools/ScrollbarTool.mjs +80 -0
- package/dist/mjs/tools/SelectionTool/SelectAllShortcutHandler.d.ts +9 -0
- package/dist/mjs/tools/SelectionTool/SelectAllShortcutHandler.mjs +26 -0
- package/dist/mjs/tools/SelectionTool/Selection.d.ts +72 -0
- package/dist/mjs/tools/SelectionTool/Selection.mjs +610 -0
- package/dist/mjs/tools/SelectionTool/SelectionHandle.d.ts +62 -0
- package/dist/mjs/tools/SelectionTool/SelectionHandle.mjs +140 -0
- package/dist/mjs/tools/SelectionTool/SelectionMenuShortcut.d.ts +32 -0
- package/dist/mjs/tools/SelectionTool/SelectionMenuShortcut.mjs +85 -0
- package/dist/mjs/tools/SelectionTool/SelectionTool.d.ts +42 -0
- package/dist/mjs/tools/SelectionTool/SelectionTool.mjs +502 -0
- package/dist/mjs/tools/SelectionTool/SelectionTool.selecting.test.d.ts +1 -0
- package/dist/mjs/tools/SelectionTool/SelectionTool.test.d.ts +1 -0
- package/dist/mjs/tools/SelectionTool/ToPointerAutoscroller.d.ts +23 -0
- package/dist/mjs/tools/SelectionTool/ToPointerAutoscroller.mjs +77 -0
- package/dist/mjs/tools/SelectionTool/TransformMode.d.ts +42 -0
- package/dist/mjs/tools/SelectionTool/TransformMode.mjs +145 -0
- package/dist/mjs/tools/SelectionTool/keybindings.d.ts +15 -0
- package/dist/mjs/tools/SelectionTool/keybindings.mjs +32 -0
- package/dist/mjs/tools/SelectionTool/types.d.ts +35 -0
- package/dist/mjs/tools/SelectionTool/types.mjs +11 -0
- package/dist/mjs/tools/SelectionTool/util/makeClipboardErrorHandlers.d.ts +6 -0
- package/dist/mjs/tools/SelectionTool/util/makeClipboardErrorHandlers.mjs +66 -0
- package/dist/mjs/tools/SelectionTool/util/showSelectionContextMenu.d.ts +5 -0
- package/dist/mjs/tools/SelectionTool/util/showSelectionContextMenu.mjs +47 -0
- package/dist/mjs/tools/SoundUITool.d.ts +26 -0
- package/dist/mjs/tools/SoundUITool.mjs +167 -0
- package/dist/mjs/tools/TextTool.d.ts +36 -0
- package/dist/mjs/tools/TextTool.mjs +281 -0
- package/dist/mjs/tools/TextTool.test.d.ts +1 -0
- package/dist/mjs/tools/ToolController.d.ts +73 -0
- package/dist/mjs/tools/ToolController.mjs +281 -0
- package/dist/mjs/tools/ToolController.test.d.ts +1 -0
- package/dist/mjs/tools/ToolEnabledGroup.d.ts +6 -0
- package/dist/mjs/tools/ToolEnabledGroup.mjs +10 -0
- package/dist/mjs/tools/ToolSwitcherShortcut.d.ts +16 -0
- package/dist/mjs/tools/ToolSwitcherShortcut.mjs +34 -0
- package/dist/mjs/tools/ToolbarShortcutHandler.d.ts +12 -0
- package/dist/mjs/tools/ToolbarShortcutHandler.mjs +28 -0
- package/dist/mjs/tools/UndoRedoShortcut.d.ts +8 -0
- package/dist/mjs/tools/UndoRedoShortcut.mjs +21 -0
- package/dist/mjs/tools/UndoRedoShortcut.test.d.ts +1 -0
- package/dist/mjs/tools/keybindings.d.ts +16 -0
- package/dist/mjs/tools/keybindings.mjs +38 -0
- package/dist/mjs/tools/lib.d.ts +14 -0
- package/dist/mjs/tools/lib.mjs +14 -0
- package/dist/mjs/tools/localization.d.ts +45 -0
- package/dist/mjs/tools/localization.mjs +44 -0
- package/dist/mjs/tools/util/StationaryPenDetector.d.ts +25 -0
- package/dist/mjs/tools/util/StationaryPenDetector.mjs +103 -0
- package/dist/mjs/tools/util/createMenuOverlay.d.ts +10 -0
- package/dist/mjs/tools/util/createMenuOverlay.mjs +121 -0
- package/dist/mjs/tools/util/createMenuOverlay.test.d.ts +1 -0
- 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 +6 -0
- package/src/tools/ScrollbarTool.scss +61 -0
- package/src/tools/SelectionTool/SelectionTool.scss +173 -0
- package/src/tools/SelectionTool/util/makeClipboardErrorHandlers.scss +14 -0
- package/src/tools/SoundUITool.scss +22 -0
- package/src/tools/tools.scss +5 -0
- package/src/tools/util/createMenuOverlay.scss +73 -0
- package/tsconfig.json +1 -3
- package/typedoc.json +1 -1
@@ -0,0 +1,509 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
exports.cssPrefix = void 0;
|
7
|
+
const math_1 = require("@js-draw/math");
|
8
|
+
const types_1 = require("../../types");
|
9
|
+
const Viewport_1 = __importDefault(require("../../Viewport"));
|
10
|
+
const BaseTool_1 = __importDefault(require("../BaseTool"));
|
11
|
+
const CanvasRenderer_1 = __importDefault(require("../../rendering/renderers/CanvasRenderer"));
|
12
|
+
const SVGRenderer_1 = __importDefault(require("../../rendering/renderers/SVGRenderer"));
|
13
|
+
const Selection_1 = __importDefault(require("./Selection"));
|
14
|
+
const TextComponent_1 = __importDefault(require("../../components/TextComponent"));
|
15
|
+
const keybindings_1 = require("../keybindings");
|
16
|
+
const ToPointerAutoscroller_1 = __importDefault(require("./ToPointerAutoscroller"));
|
17
|
+
const showSelectionContextMenu_1 = __importDefault(require("./util/showSelectionContextMenu"));
|
18
|
+
exports.cssPrefix = 'selection-tool-';
|
19
|
+
// Allows users to select/transform portions of the `EditorImage`.
|
20
|
+
// With respect to `extend`ing, `SelectionTool` is not stable.
|
21
|
+
class SelectionTool extends BaseTool_1.default {
|
22
|
+
constructor(editor, description) {
|
23
|
+
super(editor.notifier, description);
|
24
|
+
this.editor = editor;
|
25
|
+
// True if clearing and recreating the selectionBox has been deferred. This is used to prevent the selection
|
26
|
+
// from vanishing on pointerdown events that are intended to form other gestures (e.g. long press) that would
|
27
|
+
// ultimately restore the selection.
|
28
|
+
this.rebuildSelectionScheduled = false;
|
29
|
+
this.startPoint = null; // canvas position
|
30
|
+
this.expandingSelectionBox = false;
|
31
|
+
this.shiftKeyPressed = false;
|
32
|
+
this.snapToGrid = false;
|
33
|
+
this.lastPointer = null;
|
34
|
+
this.showContextMenu = async (canvasAnchor, preferSelectionMenu = true) => {
|
35
|
+
await (0, showSelectionContextMenu_1.default)(this.selectionBox, this.editor, canvasAnchor, preferSelectionMenu, () => this.clearSelection());
|
36
|
+
};
|
37
|
+
this.selectionBoxHandlingEvt = false;
|
38
|
+
this.lastSelectedObjects = [];
|
39
|
+
// Whether the last keypress corresponded to an action that didn't transform the
|
40
|
+
// selection (and thus does not need to be finalized on onKeyUp).
|
41
|
+
this.hasUnfinalizedTransformFromKeyPress = false;
|
42
|
+
this.autoscroller = new ToPointerAutoscroller_1.default(editor.viewport, (scrollBy) => {
|
43
|
+
editor.dispatch(Viewport_1.default.transformBy(math_1.Mat33.translation(scrollBy)), false);
|
44
|
+
// Update the selection box/content to match the new viewport.
|
45
|
+
if (this.lastPointer) {
|
46
|
+
// The viewport has changed -- ensure that the screen and canvas positions
|
47
|
+
// of the pointer are both correct
|
48
|
+
const updatedPointer = this.lastPointer.withScreenPosition(this.lastPointer.screenPos, editor.viewport);
|
49
|
+
this.onMainPointerUpdated(updatedPointer);
|
50
|
+
}
|
51
|
+
});
|
52
|
+
this.handleOverlay = document.createElement('div');
|
53
|
+
editor.createHTMLOverlay(this.handleOverlay);
|
54
|
+
this.handleOverlay.style.display = 'none';
|
55
|
+
this.handleOverlay.classList.add('handleOverlay');
|
56
|
+
editor.notifier.on(types_1.EditorEventType.ViewportChanged, (_data) => {
|
57
|
+
// The selection box could be using the wet ink display if its transformation
|
58
|
+
// hasn't been finalized yet. Clear before updating the UI.
|
59
|
+
this.editor.clearWetInk();
|
60
|
+
// If not currently selecting, ensure that the selection box
|
61
|
+
// is large enough.
|
62
|
+
if (!this.expandingSelectionBox) {
|
63
|
+
this.selectionBox?.padRegion();
|
64
|
+
}
|
65
|
+
this.selectionBox?.updateUI();
|
66
|
+
});
|
67
|
+
this.editor.handleKeyEventsFrom(this.handleOverlay);
|
68
|
+
this.editor.handlePointerEventsFrom(this.handleOverlay);
|
69
|
+
}
|
70
|
+
makeSelectionBox(selectionStartPos) {
|
71
|
+
this.prevSelectionBox = this.selectionBox;
|
72
|
+
this.selectionBox = new Selection_1.default(selectionStartPos, this.editor, this.showContextMenu);
|
73
|
+
if (!this.expandingSelectionBox) {
|
74
|
+
// Remove any previous selection rects
|
75
|
+
this.prevSelectionBox?.cancelSelection();
|
76
|
+
}
|
77
|
+
this.selectionBox.addTo(this.handleOverlay);
|
78
|
+
}
|
79
|
+
snapSelectionToGrid() {
|
80
|
+
if (!this.selectionBox)
|
81
|
+
throw new Error('No selection to snap!');
|
82
|
+
// Snap the top left corner of what we have selected.
|
83
|
+
const topLeftOfBBox = this.selectionBox.computeTightBoundingBox().topLeft;
|
84
|
+
const snappedTopLeft = this.editor.viewport.snapToGrid(topLeftOfBBox);
|
85
|
+
const snapDelta = snappedTopLeft.minus(topLeftOfBBox);
|
86
|
+
const oldTransform = this.selectionBox.getTransform();
|
87
|
+
this.selectionBox.setTransform(oldTransform.rightMul(math_1.Mat33.translation(snapDelta)));
|
88
|
+
this.selectionBox.finalizeTransform();
|
89
|
+
}
|
90
|
+
onContextMenu(event) {
|
91
|
+
const canShowSelectionMenu = this.selectionBox
|
92
|
+
?.getScreenRegion()
|
93
|
+
?.containsPoint(event.screenPos);
|
94
|
+
void this.showContextMenu(event.canvasPos, canShowSelectionMenu);
|
95
|
+
return true;
|
96
|
+
}
|
97
|
+
onPointerDown({ allPointers, current }) {
|
98
|
+
const snapToGrid = this.snapToGrid;
|
99
|
+
if (snapToGrid) {
|
100
|
+
current = current.snappedToGrid(this.editor.viewport);
|
101
|
+
}
|
102
|
+
// Don't rely on .isPrimary -- it's buggy in Firefox. See https://github.com/personalizedrefrigerator/js-draw/issues/71
|
103
|
+
if (allPointers.length === 1) {
|
104
|
+
this.startPoint = current.canvasPos;
|
105
|
+
let transforming = false;
|
106
|
+
if (this.selectionBox) {
|
107
|
+
if (snapToGrid) {
|
108
|
+
this.snapSelectionToGrid();
|
109
|
+
}
|
110
|
+
const dragStartResult = this.selectionBox.onDragStart(current);
|
111
|
+
if (dragStartResult) {
|
112
|
+
transforming = true;
|
113
|
+
this.selectionBoxHandlingEvt = true;
|
114
|
+
this.expandingSelectionBox = false;
|
115
|
+
}
|
116
|
+
}
|
117
|
+
if (!transforming) {
|
118
|
+
// Shift key: Combine the new and old selection boxes at the end of the gesture.
|
119
|
+
this.expandingSelectionBox = this.shiftKeyPressed;
|
120
|
+
this.rebuildSelectionScheduled = true;
|
121
|
+
}
|
122
|
+
else {
|
123
|
+
// Only autoscroll if we're transforming an existing selection
|
124
|
+
this.autoscroller.start();
|
125
|
+
}
|
126
|
+
return true;
|
127
|
+
}
|
128
|
+
return false;
|
129
|
+
}
|
130
|
+
onPointerMove(event) {
|
131
|
+
this.onMainPointerUpdated(event.current);
|
132
|
+
}
|
133
|
+
onMainPointerUpdated(currentPointer) {
|
134
|
+
this.lastPointer = currentPointer;
|
135
|
+
if (this.rebuildSelectionScheduled) {
|
136
|
+
this.rebuildSelectionScheduled = false;
|
137
|
+
this.makeSelectionBox(this.startPoint ?? currentPointer.canvasPos);
|
138
|
+
this.selectionBox?.setHandlesVisible(false);
|
139
|
+
}
|
140
|
+
if (!this.selectionBox)
|
141
|
+
return;
|
142
|
+
this.autoscroller.onPointerMove(currentPointer.screenPos);
|
143
|
+
if (!this.expandingSelectionBox && this.shiftKeyPressed && this.startPoint) {
|
144
|
+
const screenPos = this.editor.viewport.canvasToScreen(this.startPoint);
|
145
|
+
currentPointer = currentPointer.lockedToXYAxesScreen(screenPos, this.editor.viewport);
|
146
|
+
}
|
147
|
+
if (this.snapToGrid) {
|
148
|
+
currentPointer = currentPointer.snappedToGrid(this.editor.viewport);
|
149
|
+
}
|
150
|
+
if (this.selectionBoxHandlingEvt) {
|
151
|
+
this.selectionBox.onDragUpdate(currentPointer);
|
152
|
+
}
|
153
|
+
else {
|
154
|
+
this.selectionBox.setToPoint(currentPointer.canvasPos);
|
155
|
+
}
|
156
|
+
}
|
157
|
+
onPointerUp(event) {
|
158
|
+
this.onMainPointerUpdated(event.current);
|
159
|
+
this.autoscroller.stop();
|
160
|
+
if (!this.selectionBox)
|
161
|
+
return;
|
162
|
+
this.selectionBox.setHandlesVisible(true);
|
163
|
+
// Were we expanding the previous selection?
|
164
|
+
if (this.expandingSelectionBox && this.prevSelectionBox) {
|
165
|
+
// If so, finish expanding.
|
166
|
+
this.expandingSelectionBox = false;
|
167
|
+
this.selectionBox.resolveToObjects();
|
168
|
+
this.setSelection([
|
169
|
+
...this.selectionBox.getSelectedObjects(),
|
170
|
+
...this.prevSelectionBox.getSelectedObjects(),
|
171
|
+
]);
|
172
|
+
}
|
173
|
+
else {
|
174
|
+
if (!this.selectionBoxHandlingEvt) {
|
175
|
+
// Expand/shrink the selection rectangle, if applicable
|
176
|
+
this.selectionBox.resolveToObjects();
|
177
|
+
this.onSelectionUpdated();
|
178
|
+
}
|
179
|
+
else {
|
180
|
+
this.selectionBox.onDragEnd();
|
181
|
+
}
|
182
|
+
this.selectionBoxHandlingEvt = false;
|
183
|
+
this.lastPointer = null;
|
184
|
+
}
|
185
|
+
}
|
186
|
+
onGestureCancel() {
|
187
|
+
this.autoscroller.stop();
|
188
|
+
if (this.selectionBoxHandlingEvt) {
|
189
|
+
this.selectionBox?.onDragCancel();
|
190
|
+
}
|
191
|
+
else if (!this.rebuildSelectionScheduled) {
|
192
|
+
// Revert to the previous selection, if any.
|
193
|
+
this.selectionBox?.cancelSelection();
|
194
|
+
this.selectionBox = this.prevSelectionBox;
|
195
|
+
this.selectionBox?.addTo(this.handleOverlay);
|
196
|
+
this.selectionBox?.recomputeRegion();
|
197
|
+
this.prevSelectionBox = null;
|
198
|
+
}
|
199
|
+
this.rebuildSelectionScheduled = false;
|
200
|
+
this.expandingSelectionBox = false;
|
201
|
+
this.lastPointer = null;
|
202
|
+
this.selectionBoxHandlingEvt = false;
|
203
|
+
}
|
204
|
+
onSelectionUpdated() {
|
205
|
+
const selectedItemCount = this.selectionBox?.getSelectedItemCount() ?? 0;
|
206
|
+
const selectedObjects = this.selectionBox?.getSelectedObjects() ?? [];
|
207
|
+
const hasDifferentSelection = this.lastSelectedObjects.length !== selectedItemCount ||
|
208
|
+
selectedObjects.some((obj, i) => this.lastSelectedObjects[i] !== obj);
|
209
|
+
if (hasDifferentSelection) {
|
210
|
+
this.lastSelectedObjects = selectedObjects;
|
211
|
+
// Note that the selection has changed
|
212
|
+
this.editor.notifier.dispatch(types_1.EditorEventType.ToolUpdated, {
|
213
|
+
kind: types_1.EditorEventType.ToolUpdated,
|
214
|
+
tool: this,
|
215
|
+
});
|
216
|
+
// Only fire the SelectionUpdated event if the selection really updated.
|
217
|
+
this.editor.notifier.dispatch(types_1.EditorEventType.SelectionUpdated, {
|
218
|
+
kind: types_1.EditorEventType.SelectionUpdated,
|
219
|
+
selectedComponents: selectedObjects,
|
220
|
+
tool: this,
|
221
|
+
});
|
222
|
+
if (selectedItemCount > 0) {
|
223
|
+
this.editor.announceForAccessibility(this.editor.localization.selectedElements(selectedItemCount));
|
224
|
+
this.zoomToSelection();
|
225
|
+
}
|
226
|
+
}
|
227
|
+
if (selectedItemCount === 0 && this.selectionBox) {
|
228
|
+
this.selectionBox.cancelSelection();
|
229
|
+
this.prevSelectionBox = this.selectionBox;
|
230
|
+
this.selectionBox = null;
|
231
|
+
}
|
232
|
+
}
|
233
|
+
zoomToSelection() {
|
234
|
+
if (this.selectionBox) {
|
235
|
+
const selectionRect = this.selectionBox.region;
|
236
|
+
this.editor.dispatchNoAnnounce(this.editor.viewport.zoomTo(selectionRect, false), false);
|
237
|
+
}
|
238
|
+
}
|
239
|
+
onKeyPress(event) {
|
240
|
+
const shortcucts = this.editor.shortcuts;
|
241
|
+
if (shortcucts.matchesShortcut(keybindings_1.snapToGridKeyboardShortcutId, event)) {
|
242
|
+
this.snapToGrid = true;
|
243
|
+
return true;
|
244
|
+
}
|
245
|
+
if (this.selectionBox &&
|
246
|
+
(shortcucts.matchesShortcut(keybindings_1.duplicateSelectionShortcut, event) ||
|
247
|
+
shortcucts.matchesShortcut(keybindings_1.sendToBackSelectionShortcut, event))) {
|
248
|
+
// Handle duplication on key up — we don't want to accidentally duplicate
|
249
|
+
// many times.
|
250
|
+
return true;
|
251
|
+
}
|
252
|
+
else if (shortcucts.matchesShortcut(keybindings_1.selectAllKeyboardShortcut, event)) {
|
253
|
+
this.setSelection(this.editor.image.getAllElements());
|
254
|
+
return true;
|
255
|
+
}
|
256
|
+
else if (event.ctrlKey) {
|
257
|
+
// Don't transform the selection with, for example, ctrl+i.
|
258
|
+
// Pass it to another tool, if apliccable.
|
259
|
+
return false;
|
260
|
+
}
|
261
|
+
else if (event.shiftKey || event.key === 'Shift') {
|
262
|
+
this.shiftKeyPressed = true;
|
263
|
+
if (event.key === 'Shift') {
|
264
|
+
return true;
|
265
|
+
}
|
266
|
+
}
|
267
|
+
let rotationSteps = 0;
|
268
|
+
let xTranslateSteps = 0;
|
269
|
+
let yTranslateSteps = 0;
|
270
|
+
let xScaleSteps = 0;
|
271
|
+
let yScaleSteps = 0;
|
272
|
+
if (shortcucts.matchesShortcut(keybindings_1.translateLeftSelectionShortcutId, event)) {
|
273
|
+
xTranslateSteps -= 1;
|
274
|
+
}
|
275
|
+
else if (shortcucts.matchesShortcut(keybindings_1.translateRightSelectionShortcutId, event)) {
|
276
|
+
xTranslateSteps += 1;
|
277
|
+
}
|
278
|
+
else if (shortcucts.matchesShortcut(keybindings_1.translateUpSelectionShortcutId, event)) {
|
279
|
+
yTranslateSteps -= 1;
|
280
|
+
}
|
281
|
+
else if (shortcucts.matchesShortcut(keybindings_1.translateDownSelectionShortcutId, event)) {
|
282
|
+
yTranslateSteps += 1;
|
283
|
+
}
|
284
|
+
else if (shortcucts.matchesShortcut(keybindings_1.rotateClockwiseSelectionShortcutId, event)) {
|
285
|
+
rotationSteps += 1;
|
286
|
+
}
|
287
|
+
else if (shortcucts.matchesShortcut(keybindings_1.rotateCounterClockwiseSelectionShortcutId, event)) {
|
288
|
+
rotationSteps -= 1;
|
289
|
+
}
|
290
|
+
else if (shortcucts.matchesShortcut(keybindings_1.shrinkXSelectionShortcutId, event)) {
|
291
|
+
xScaleSteps -= 1;
|
292
|
+
}
|
293
|
+
else if (shortcucts.matchesShortcut(keybindings_1.stretchXSelectionShortcutId, event)) {
|
294
|
+
xScaleSteps += 1;
|
295
|
+
}
|
296
|
+
else if (shortcucts.matchesShortcut(keybindings_1.shrinkYSelectionShortcutId, event)) {
|
297
|
+
yScaleSteps -= 1;
|
298
|
+
}
|
299
|
+
else if (shortcucts.matchesShortcut(keybindings_1.stretchYSelectionShortcutId, event)) {
|
300
|
+
yScaleSteps += 1;
|
301
|
+
}
|
302
|
+
else if (shortcucts.matchesShortcut(keybindings_1.shrinkXYSelectionShortcutId, event)) {
|
303
|
+
xScaleSteps -= 1;
|
304
|
+
yScaleSteps -= 1;
|
305
|
+
}
|
306
|
+
else if (shortcucts.matchesShortcut(keybindings_1.stretchXYSelectionShortcutId, event)) {
|
307
|
+
xScaleSteps += 1;
|
308
|
+
yScaleSteps += 1;
|
309
|
+
}
|
310
|
+
let handled = xTranslateSteps !== 0 ||
|
311
|
+
yTranslateSteps !== 0 ||
|
312
|
+
rotationSteps !== 0 ||
|
313
|
+
xScaleSteps !== 0 ||
|
314
|
+
yScaleSteps !== 0;
|
315
|
+
if (!this.selectionBox) {
|
316
|
+
handled = false;
|
317
|
+
}
|
318
|
+
else if (handled) {
|
319
|
+
const translateStepSize = 10 * this.editor.viewport.getSizeOfPixelOnCanvas();
|
320
|
+
const rotateStepSize = Math.PI / 8;
|
321
|
+
const scaleStepSize = 5 / 4;
|
322
|
+
const region = this.selectionBox.region;
|
323
|
+
const scaleFactor = math_1.Vec2.of(scaleStepSize ** xScaleSteps, scaleStepSize ** yScaleSteps);
|
324
|
+
const rotationMat = math_1.Mat33.zRotation(rotationSteps * rotateStepSize);
|
325
|
+
const roundedRotationMatrix = rotationMat.mapEntries((component) => Viewport_1.default.roundScaleRatio(component));
|
326
|
+
const regionCenter = this.editor.viewport.roundPoint(region.center);
|
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))));
|
332
|
+
const oldTransform = this.selectionBox.getTransform();
|
333
|
+
this.selectionBox.setTransform(oldTransform.rightMul(transform));
|
334
|
+
this.selectionBox.scrollTo();
|
335
|
+
// The transformation needs to be finalized at some point (on key up)
|
336
|
+
this.hasUnfinalizedTransformFromKeyPress = true;
|
337
|
+
}
|
338
|
+
if (this.selectionBox && !handled && (event.key === 'Delete' || event.key === 'Backspace')) {
|
339
|
+
this.editor.dispatch(this.selectionBox.deleteSelectedObjects());
|
340
|
+
this.clearSelection();
|
341
|
+
handled = true;
|
342
|
+
}
|
343
|
+
return handled;
|
344
|
+
}
|
345
|
+
onKeyUp(evt) {
|
346
|
+
const shortcucts = this.editor.shortcuts;
|
347
|
+
if (shortcucts.matchesShortcut(keybindings_1.snapToGridKeyboardShortcutId, evt)) {
|
348
|
+
this.snapToGrid = false;
|
349
|
+
return true;
|
350
|
+
}
|
351
|
+
if (shortcucts.matchesShortcut(keybindings_1.selectAllKeyboardShortcut, evt)) {
|
352
|
+
// Selected all in onKeyDown. Don't finalizeTransform.
|
353
|
+
return true;
|
354
|
+
}
|
355
|
+
if (this.selectionBox && shortcucts.matchesShortcut(keybindings_1.duplicateSelectionShortcut, evt)) {
|
356
|
+
// Finalize duplicating the selection
|
357
|
+
this.selectionBox.duplicateSelectedObjects().then((command) => {
|
358
|
+
this.editor.dispatch(command);
|
359
|
+
});
|
360
|
+
return true;
|
361
|
+
}
|
362
|
+
if (this.selectionBox && shortcucts.matchesShortcut(keybindings_1.sendToBackSelectionShortcut, evt)) {
|
363
|
+
const sendToBackCommand = this.selectionBox.sendToBack();
|
364
|
+
if (sendToBackCommand) {
|
365
|
+
this.editor.dispatch(sendToBackCommand);
|
366
|
+
}
|
367
|
+
return true;
|
368
|
+
}
|
369
|
+
// Here, we check if shiftKey === false because, as of this writing,
|
370
|
+
// evt.shiftKey is an optional property. Being falsey could just mean
|
371
|
+
// that it wasn't set.
|
372
|
+
if (evt.shiftKey === false) {
|
373
|
+
this.shiftKeyPressed = false;
|
374
|
+
// Don't return immediately -- event may be otherwise handled
|
375
|
+
}
|
376
|
+
// Also check for key === 'Shift' (for the case where shiftKey is undefined)
|
377
|
+
if (evt.key === 'Shift') {
|
378
|
+
this.shiftKeyPressed = false;
|
379
|
+
return true;
|
380
|
+
}
|
381
|
+
// If we don't need to finalize the transform
|
382
|
+
if (!this.hasUnfinalizedTransformFromKeyPress) {
|
383
|
+
return true;
|
384
|
+
}
|
385
|
+
if (this.selectionBox) {
|
386
|
+
this.selectionBox.finalizeTransform();
|
387
|
+
this.hasUnfinalizedTransformFromKeyPress = false;
|
388
|
+
return true;
|
389
|
+
}
|
390
|
+
return false;
|
391
|
+
}
|
392
|
+
onCopy(event) {
|
393
|
+
if (!this.selectionBox) {
|
394
|
+
return false;
|
395
|
+
}
|
396
|
+
const selectedElems = this.selectionBox.getSelectedObjects();
|
397
|
+
const bbox = this.selectionBox.region;
|
398
|
+
if (selectedElems.length === 0) {
|
399
|
+
return false;
|
400
|
+
}
|
401
|
+
const exportViewport = new Viewport_1.default(() => { });
|
402
|
+
const selectionScreenSize = this.selectionBox
|
403
|
+
.getScreenRegion()
|
404
|
+
.size.times(this.editor.display.getDevicePixelRatio());
|
405
|
+
// Update the viewport to have screen size roughly equal to the size of the selection box
|
406
|
+
let scaleFactor = selectionScreenSize.maximumEntryMagnitude() / (bbox.size.maximumEntryMagnitude() || 1);
|
407
|
+
// Round to a nearby power of two
|
408
|
+
scaleFactor = Math.pow(2, Math.ceil(Math.log2(scaleFactor)));
|
409
|
+
exportViewport.updateScreenSize(bbox.size.times(scaleFactor));
|
410
|
+
exportViewport.resetTransform(math_1.Mat33.scaling2D(scaleFactor)
|
411
|
+
// Move the selection onto the screen
|
412
|
+
.rightMul(math_1.Mat33.translation(bbox.topLeft.times(-1))));
|
413
|
+
const { element: svgExportElem, renderer: svgRenderer } = SVGRenderer_1.default.fromViewport(exportViewport, { sanitize: true, useViewBoxForPositioning: true });
|
414
|
+
const { element: canvas, renderer: canvasRenderer } = CanvasRenderer_1.default.fromViewport(exportViewport, { maxCanvasDimen: 4096 });
|
415
|
+
const text = [];
|
416
|
+
for (const elem of selectedElems) {
|
417
|
+
elem.render(svgRenderer);
|
418
|
+
elem.render(canvasRenderer);
|
419
|
+
if (elem instanceof TextComponent_1.default) {
|
420
|
+
text.push(elem.getText());
|
421
|
+
}
|
422
|
+
}
|
423
|
+
event.setData('image/svg+xml', svgExportElem.outerHTML);
|
424
|
+
event.setData('text/html', svgExportElem.outerHTML);
|
425
|
+
event.setData('image/png', new Promise((resolve, reject) => {
|
426
|
+
canvas.toBlob((blob) => {
|
427
|
+
if (blob) {
|
428
|
+
resolve(blob);
|
429
|
+
}
|
430
|
+
else {
|
431
|
+
reject(new Error('Failed to convert canvas to blob.'));
|
432
|
+
}
|
433
|
+
}, 'image/png');
|
434
|
+
}));
|
435
|
+
if (text.length > 0) {
|
436
|
+
event.setData('text/plain', text.join('\n'));
|
437
|
+
}
|
438
|
+
return true;
|
439
|
+
}
|
440
|
+
setEnabled(enabled) {
|
441
|
+
const wasEnabled = this.isEnabled();
|
442
|
+
super.setEnabled(enabled);
|
443
|
+
if (wasEnabled === enabled) {
|
444
|
+
return;
|
445
|
+
}
|
446
|
+
// Clear the selection
|
447
|
+
this.selectionBox?.cancelSelection();
|
448
|
+
this.onSelectionUpdated();
|
449
|
+
this.handleOverlay.replaceChildren();
|
450
|
+
this.selectionBox = null;
|
451
|
+
this.shiftKeyPressed = false;
|
452
|
+
this.snapToGrid = false;
|
453
|
+
this.handleOverlay.style.display = enabled ? 'block' : 'none';
|
454
|
+
if (enabled) {
|
455
|
+
this.handleOverlay.tabIndex = 0;
|
456
|
+
this.handleOverlay.setAttribute('aria-label', this.editor.localization.selectionToolKeyboardShortcuts);
|
457
|
+
}
|
458
|
+
else {
|
459
|
+
this.handleOverlay.tabIndex = -1;
|
460
|
+
}
|
461
|
+
}
|
462
|
+
// Get the object responsible for displaying this' selection.
|
463
|
+
// @internal
|
464
|
+
getSelection() {
|
465
|
+
return this.selectionBox;
|
466
|
+
}
|
467
|
+
getSelectedObjects() {
|
468
|
+
return this.selectionBox?.getSelectedObjects() ?? [];
|
469
|
+
}
|
470
|
+
// Select the given `objects`. Any non-selectable objects in `objects` are ignored.
|
471
|
+
setSelection(objects) {
|
472
|
+
// Only select selectable objects.
|
473
|
+
objects = objects.filter((obj) => obj.isSelectable());
|
474
|
+
// Sort by z-index
|
475
|
+
objects.sort((a, b) => a.getZIndex() - b.getZIndex());
|
476
|
+
// Remove duplicates
|
477
|
+
objects = objects.filter((current, idx) => {
|
478
|
+
if (idx > 0) {
|
479
|
+
return current !== objects[idx - 1];
|
480
|
+
}
|
481
|
+
return true;
|
482
|
+
});
|
483
|
+
let bbox = null;
|
484
|
+
for (const object of objects) {
|
485
|
+
if (bbox) {
|
486
|
+
bbox = bbox.union(object.getBBox());
|
487
|
+
}
|
488
|
+
else {
|
489
|
+
bbox = object.getBBox();
|
490
|
+
}
|
491
|
+
}
|
492
|
+
if (!bbox) {
|
493
|
+
return;
|
494
|
+
}
|
495
|
+
this.clearSelection();
|
496
|
+
if (!this.selectionBox) {
|
497
|
+
this.makeSelectionBox(bbox.topLeft);
|
498
|
+
}
|
499
|
+
this.selectionBox.setSelectedObjects(objects, bbox);
|
500
|
+
this.onSelectionUpdated();
|
501
|
+
}
|
502
|
+
clearSelection() {
|
503
|
+
this.handleOverlay.replaceChildren();
|
504
|
+
this.prevSelectionBox = this.selectionBox;
|
505
|
+
this.selectionBox = null;
|
506
|
+
this.onSelectionUpdated();
|
507
|
+
}
|
508
|
+
}
|
509
|
+
exports.default = SelectionTool;
|
@@ -0,0 +1 @@
|
|
1
|
+
export {};
|
@@ -0,0 +1 @@
|
|
1
|
+
export {};
|
@@ -0,0 +1,23 @@
|
|
1
|
+
import { Point2, Vec2 } from '@js-draw/math';
|
2
|
+
import Viewport from '../../Viewport';
|
3
|
+
type ScrollByCallback = (delta: Vec2) => void;
|
4
|
+
/**
|
5
|
+
* Automatically scrolls the viewport such that the user's pointer is visible.
|
6
|
+
*/
|
7
|
+
export default class ToPointerAutoscroller {
|
8
|
+
private viewport;
|
9
|
+
private scrollByCanvasDelta;
|
10
|
+
private started;
|
11
|
+
private updateLoopId;
|
12
|
+
private updateLoopRunning;
|
13
|
+
private targetPoint;
|
14
|
+
private scrollRate;
|
15
|
+
constructor(viewport: Viewport, scrollByCanvasDelta: ScrollByCallback);
|
16
|
+
private getScrollForPoint;
|
17
|
+
start(): void;
|
18
|
+
onPointerMove(pointerScreenPosition: Point2): void;
|
19
|
+
stop(): void;
|
20
|
+
private startUpdateLoop;
|
21
|
+
private stopUpdateLoop;
|
22
|
+
}
|
23
|
+
export {};
|
@@ -0,0 +1,83 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
const math_1 = require("@js-draw/math");
|
7
|
+
const untilNextAnimationFrame_1 = __importDefault(require("../../util/untilNextAnimationFrame"));
|
8
|
+
/**
|
9
|
+
* Automatically scrolls the viewport such that the user's pointer is visible.
|
10
|
+
*/
|
11
|
+
class ToPointerAutoscroller {
|
12
|
+
constructor(viewport, scrollByCanvasDelta) {
|
13
|
+
this.viewport = viewport;
|
14
|
+
this.scrollByCanvasDelta = scrollByCanvasDelta;
|
15
|
+
this.started = false;
|
16
|
+
this.updateLoopId = 0;
|
17
|
+
this.updateLoopRunning = false;
|
18
|
+
this.targetPoint = null;
|
19
|
+
this.scrollRate = 1000; // px/s
|
20
|
+
}
|
21
|
+
getScrollForPoint(screenPoint) {
|
22
|
+
const screenSize = this.viewport.getScreenRectSize();
|
23
|
+
const screenRect = new math_1.Rect2(0, 0, screenSize.x, screenSize.y);
|
24
|
+
// Starts autoscrolling when the cursor is **outside of** this region
|
25
|
+
const marginSize = 44;
|
26
|
+
const autoscrollBoundary = screenRect.grownBy(-marginSize);
|
27
|
+
if (autoscrollBoundary.containsPoint(screenPoint)) {
|
28
|
+
return math_1.Vec2.zero;
|
29
|
+
}
|
30
|
+
const closestEdgePoint = autoscrollBoundary.getClosestPointOnBoundaryTo(screenPoint);
|
31
|
+
const distToEdge = closestEdgePoint.distanceTo(screenPoint);
|
32
|
+
const toEdge = closestEdgePoint.minus(screenPoint);
|
33
|
+
// Go faster for points further away from the boundary.
|
34
|
+
const maximumScaleFactor = 1.25;
|
35
|
+
const scaleFactor = Math.min(distToEdge / marginSize, maximumScaleFactor);
|
36
|
+
return toEdge.normalizedOrZero().times(scaleFactor);
|
37
|
+
}
|
38
|
+
start() {
|
39
|
+
this.started = true;
|
40
|
+
}
|
41
|
+
onPointerMove(pointerScreenPosition) {
|
42
|
+
if (!this.started) {
|
43
|
+
return;
|
44
|
+
}
|
45
|
+
if (this.getScrollForPoint(pointerScreenPosition) === math_1.Vec2.zero) {
|
46
|
+
this.stopUpdateLoop();
|
47
|
+
}
|
48
|
+
else {
|
49
|
+
this.targetPoint = pointerScreenPosition;
|
50
|
+
this.startUpdateLoop();
|
51
|
+
}
|
52
|
+
}
|
53
|
+
stop() {
|
54
|
+
this.targetPoint = null;
|
55
|
+
this.started = false;
|
56
|
+
this.stopUpdateLoop();
|
57
|
+
}
|
58
|
+
startUpdateLoop() {
|
59
|
+
if (this.updateLoopRunning) {
|
60
|
+
return;
|
61
|
+
}
|
62
|
+
(async () => {
|
63
|
+
this.updateLoopId++;
|
64
|
+
const currentUpdateLoopId = this.updateLoopId;
|
65
|
+
let lastUpdateTime = performance.now();
|
66
|
+
while (this.updateLoopId === currentUpdateLoopId && this.targetPoint) {
|
67
|
+
this.updateLoopRunning = true;
|
68
|
+
const currentTime = performance.now();
|
69
|
+
const deltaTimeMs = currentTime - lastUpdateTime;
|
70
|
+
const scrollDirection = this.getScrollForPoint(this.targetPoint);
|
71
|
+
const screenScrollAmount = scrollDirection.times((this.scrollRate * deltaTimeMs) / 1000);
|
72
|
+
this.scrollByCanvasDelta(this.viewport.screenToCanvasTransform.transformVec3(screenScrollAmount));
|
73
|
+
lastUpdateTime = currentTime;
|
74
|
+
await (0, untilNextAnimationFrame_1.default)();
|
75
|
+
}
|
76
|
+
this.updateLoopRunning = false;
|
77
|
+
})();
|
78
|
+
}
|
79
|
+
stopUpdateLoop() {
|
80
|
+
this.updateLoopId++;
|
81
|
+
}
|
82
|
+
}
|
83
|
+
exports.default = ToPointerAutoscroller;
|
@@ -0,0 +1,42 @@
|
|
1
|
+
import Editor from '../../Editor';
|
2
|
+
import { Vec3 } from '@js-draw/math';
|
3
|
+
import Selection from './Selection';
|
4
|
+
import { ResizeMode } from './types';
|
5
|
+
export declare class DragTransformer {
|
6
|
+
private readonly editor;
|
7
|
+
private selection;
|
8
|
+
private dragStartPoint;
|
9
|
+
constructor(editor: Editor, selection: Selection);
|
10
|
+
onDragStart(startPoint: Vec3): void;
|
11
|
+
onDragUpdate(canvasPos: Vec3): void;
|
12
|
+
onDragEnd(): void | Promise<void>;
|
13
|
+
}
|
14
|
+
export declare class ResizeTransformer {
|
15
|
+
private readonly editor;
|
16
|
+
private selection;
|
17
|
+
private mode;
|
18
|
+
private dragStartPoint;
|
19
|
+
private transformOrigin;
|
20
|
+
private scaleRate;
|
21
|
+
constructor(editor: Editor, selection: Selection);
|
22
|
+
onDragStart(startPoint: Vec3, mode: ResizeMode): void;
|
23
|
+
private computeOriginAndScaleRate;
|
24
|
+
onDragUpdate(canvasPos: Vec3): void;
|
25
|
+
onDragEnd(): void | Promise<void>;
|
26
|
+
}
|
27
|
+
export declare class RotateTransformer {
|
28
|
+
private readonly editor;
|
29
|
+
private selection;
|
30
|
+
private startAngle;
|
31
|
+
private targetRotation;
|
32
|
+
private maximumDistFromStart;
|
33
|
+
private startPoint;
|
34
|
+
private startTime;
|
35
|
+
constructor(editor: Editor, selection: Selection);
|
36
|
+
private getAngle;
|
37
|
+
private roundAngle;
|
38
|
+
onDragStart(startPoint: Vec3): void;
|
39
|
+
private setRotationTo;
|
40
|
+
onDragUpdate(canvasPos: Vec3): void;
|
41
|
+
onDragEnd(): void | Promise<void>;
|
42
|
+
}
|