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,610 @@
|
|
1
|
+
/**
|
2
|
+
* @internal
|
3
|
+
* @packageDocumentation
|
4
|
+
*/
|
5
|
+
var _a;
|
6
|
+
import SerializableCommand from '../../commands/SerializableCommand.mjs';
|
7
|
+
import { Mat33, Rect2, Vec2 } from '@js-draw/math';
|
8
|
+
import SelectionHandle, { HandleAction, handleSize } from './SelectionHandle.mjs';
|
9
|
+
import { cssPrefix } from './SelectionTool.mjs';
|
10
|
+
import Viewport from '../../Viewport.mjs';
|
11
|
+
import Erase from '../../commands/Erase.mjs';
|
12
|
+
import Duplicate from '../../commands/Duplicate.mjs';
|
13
|
+
import { DragTransformer, ResizeTransformer, RotateTransformer } from './TransformMode.mjs';
|
14
|
+
import { ResizeMode } from './types.mjs';
|
15
|
+
import EditorImage from '../../image/EditorImage.mjs';
|
16
|
+
import uniteCommands from '../../commands/uniteCommands.mjs';
|
17
|
+
import SelectionMenuShortcut from './SelectionMenuShortcut.mjs';
|
18
|
+
const updateChunkSize = 100;
|
19
|
+
const maxPreviewElemCount = 500;
|
20
|
+
// @internal
|
21
|
+
class Selection {
|
22
|
+
constructor(startPoint, editor, showContextMenu) {
|
23
|
+
this.editor = editor;
|
24
|
+
// The last-computed bounding box of selected content
|
25
|
+
// @see getTightBoundingBox
|
26
|
+
this.selectionTightBoundingBox = null;
|
27
|
+
this.transform = Mat33.identity;
|
28
|
+
// invariant: sorted by increasing z-index
|
29
|
+
this.selectedElems = [];
|
30
|
+
this.hasParent = true;
|
31
|
+
// Maps IDs to whether we removed the component from the image
|
32
|
+
this.removedFromImage = {};
|
33
|
+
this.activeHandle = null;
|
34
|
+
this.backgroundDragging = false;
|
35
|
+
this.selectionDuplicatedAnimationTimeout = null;
|
36
|
+
this.originalRegion = new Rect2(startPoint.x, startPoint.y, 0, 0);
|
37
|
+
this.transformers = {
|
38
|
+
drag: new DragTransformer(editor, this),
|
39
|
+
resize: new ResizeTransformer(editor, this),
|
40
|
+
rotate: new RotateTransformer(editor, this),
|
41
|
+
};
|
42
|
+
// We need two containers for some CSS to apply (the outer container
|
43
|
+
// needs zero height, the inner needs to prevent the selection background
|
44
|
+
// from being visible outside of the editor).
|
45
|
+
this.outerContainer = document.createElement('div');
|
46
|
+
this.outerContainer.classList.add(`${cssPrefix}selection-outer-container`);
|
47
|
+
this.innerContainer = document.createElement('div');
|
48
|
+
this.innerContainer.classList.add(`${cssPrefix}selection-inner-container`);
|
49
|
+
this.backgroundElem = document.createElement('div');
|
50
|
+
this.backgroundElem.classList.add(`${cssPrefix}selection-background`);
|
51
|
+
this.innerContainer.appendChild(this.backgroundElem);
|
52
|
+
this.outerContainer.appendChild(this.innerContainer);
|
53
|
+
const makeResizeHandle = (mode, side) => {
|
54
|
+
const modeToAction = {
|
55
|
+
[ResizeMode.Both]: HandleAction.ResizeXY,
|
56
|
+
[ResizeMode.HorizontalOnly]: HandleAction.ResizeX,
|
57
|
+
[ResizeMode.VerticalOnly]: HandleAction.ResizeY,
|
58
|
+
};
|
59
|
+
return new SelectionHandle({
|
60
|
+
action: modeToAction[mode],
|
61
|
+
side,
|
62
|
+
}, this, this.editor.viewport, (startPoint) => this.transformers.resize.onDragStart(startPoint, mode), (currentPoint) => this.transformers.resize.onDragUpdate(currentPoint), () => this.transformers.resize.onDragEnd());
|
63
|
+
};
|
64
|
+
const resizeHorizontalHandles = [
|
65
|
+
makeResizeHandle(ResizeMode.HorizontalOnly, Vec2.of(0, 0.5)),
|
66
|
+
makeResizeHandle(ResizeMode.HorizontalOnly, Vec2.of(1, 0.5)),
|
67
|
+
];
|
68
|
+
const resizeVerticalHandle = makeResizeHandle(ResizeMode.VerticalOnly, Vec2.of(0.5, 1));
|
69
|
+
const resizeBothHandle = makeResizeHandle(ResizeMode.Both, Vec2.of(1, 1));
|
70
|
+
const rotationHandle = new SelectionHandle({
|
71
|
+
action: HandleAction.Rotate,
|
72
|
+
side: Vec2.of(0.5, 0),
|
73
|
+
icon: this.editor.icons.makeRotateIcon(),
|
74
|
+
}, this, this.editor.viewport, (startPoint) => this.transformers.rotate.onDragStart(startPoint), (currentPoint) => this.transformers.rotate.onDragUpdate(currentPoint), () => this.transformers.rotate.onDragEnd());
|
75
|
+
const menuToggleButton = new SelectionMenuShortcut(this, this.editor.viewport, showContextMenu, this.editor.localization);
|
76
|
+
this.childwidgets = [
|
77
|
+
resizeBothHandle,
|
78
|
+
...resizeHorizontalHandles,
|
79
|
+
resizeVerticalHandle,
|
80
|
+
rotationHandle,
|
81
|
+
menuToggleButton,
|
82
|
+
];
|
83
|
+
for (const widget of this.childwidgets) {
|
84
|
+
widget.addTo(this.backgroundElem);
|
85
|
+
}
|
86
|
+
this.updateUI();
|
87
|
+
}
|
88
|
+
// @internal Intended for unit tests
|
89
|
+
getBackgroundElem() {
|
90
|
+
return this.backgroundElem;
|
91
|
+
}
|
92
|
+
getTransform() {
|
93
|
+
return this.transform;
|
94
|
+
}
|
95
|
+
get preTransformRegion() {
|
96
|
+
return this.originalRegion;
|
97
|
+
}
|
98
|
+
// The **canvas** region.
|
99
|
+
get region() {
|
100
|
+
// TODO: This currently assumes that the region rotates about its center.
|
101
|
+
// This may not be true.
|
102
|
+
const rotationMatrix = Mat33.zRotation(this.regionRotation, this.originalRegion.center);
|
103
|
+
const scaleAndTranslateMat = this.transform.rightMul(rotationMatrix.inverse());
|
104
|
+
return this.originalRegion.transformedBoundingBox(scaleAndTranslateMat);
|
105
|
+
}
|
106
|
+
/**
|
107
|
+
* Computes and returns the bounding box of the selection without
|
108
|
+
* any additional padding. Computes directly from the elements that are selected.
|
109
|
+
* @internal
|
110
|
+
*/
|
111
|
+
computeTightBoundingBox() {
|
112
|
+
const bbox = this.selectedElems.reduce((accumulator, elem) => {
|
113
|
+
return (accumulator ?? elem.getBBox()).union(elem.getBBox());
|
114
|
+
}, null);
|
115
|
+
return bbox ?? Rect2.empty;
|
116
|
+
}
|
117
|
+
get regionRotation() {
|
118
|
+
return this.transform.transformVec3(Vec2.unitX).angle();
|
119
|
+
}
|
120
|
+
get preTransformedScreenRegion() {
|
121
|
+
const toScreen = (vec) => this.editor.viewport.canvasToScreen(vec);
|
122
|
+
return Rect2.fromCorners(toScreen(this.preTransformRegion.topLeft), toScreen(this.preTransformRegion.bottomRight));
|
123
|
+
}
|
124
|
+
get preTransformedScreenRegionRotation() {
|
125
|
+
return this.editor.viewport.getRotationAngle();
|
126
|
+
}
|
127
|
+
getScreenRegion() {
|
128
|
+
const toScreen = this.editor.viewport.canvasToScreenTransform;
|
129
|
+
const scaleFactor = this.editor.viewport.getScaleFactor();
|
130
|
+
const screenCenter = toScreen.transformVec2(this.region.center);
|
131
|
+
return new Rect2(screenCenter.x, screenCenter.y, scaleFactor * this.region.width, scaleFactor * this.region.height).translatedBy(this.region.size.times(-scaleFactor / 2));
|
132
|
+
}
|
133
|
+
get screenRegionRotation() {
|
134
|
+
return this.regionRotation + this.editor.viewport.getRotationAngle();
|
135
|
+
}
|
136
|
+
// Applies, previews, but doesn't finalize the given transformation.
|
137
|
+
setTransform(transform, preview = true) {
|
138
|
+
this.transform = transform;
|
139
|
+
if (preview && this.hasParent) {
|
140
|
+
this.previewTransformCmds();
|
141
|
+
}
|
142
|
+
}
|
143
|
+
getDeltaZIndexToMoveSelectionToTop() {
|
144
|
+
if (this.selectedElems.length === 0) {
|
145
|
+
return 0;
|
146
|
+
}
|
147
|
+
const selectedBottommostZIndex = this.selectedElems[0].getZIndex();
|
148
|
+
const visibleObjects = this.editor.image.getElementsIntersectingRegion(this.region);
|
149
|
+
const topMostVisibleZIndex = visibleObjects[visibleObjects.length - 1]?.getZIndex() ?? selectedBottommostZIndex;
|
150
|
+
const deltaZIndex = topMostVisibleZIndex + 1 - selectedBottommostZIndex;
|
151
|
+
return deltaZIndex;
|
152
|
+
}
|
153
|
+
// Applies the current transformation to the selection
|
154
|
+
finalizeTransform() {
|
155
|
+
const fullTransform = this.transform;
|
156
|
+
const selectedElems = this.selectedElems;
|
157
|
+
// Reset for the next drag
|
158
|
+
this.originalRegion = this.originalRegion.transformedBoundingBox(this.transform);
|
159
|
+
this.transform = Mat33.identity;
|
160
|
+
this.scrollTo();
|
161
|
+
let transformPromise = undefined;
|
162
|
+
// Make the commands undo-able.
|
163
|
+
// Don't check for non-empty transforms because this breaks changing the
|
164
|
+
// z-index of the just-transformed commands.
|
165
|
+
if (this.selectedElems.length > 0) {
|
166
|
+
const deltaZIndex = this.getDeltaZIndexToMoveSelectionToTop();
|
167
|
+
transformPromise = this.editor.dispatch(new _a.ApplyTransformationCommand(this, selectedElems, fullTransform, deltaZIndex));
|
168
|
+
}
|
169
|
+
return transformPromise;
|
170
|
+
}
|
171
|
+
/** Sends all selected elements to the bottom of the visible image. */
|
172
|
+
sendToBack() {
|
173
|
+
const visibleObjects = this.editor.image.getElementsIntersectingRegion(this.editor.viewport.visibleRect);
|
174
|
+
// VisibleObjects and selectedElems should both be sorted by z-index
|
175
|
+
const lowestVisibleZIndex = visibleObjects[0]?.getZIndex() ?? 0;
|
176
|
+
const highestSelectedZIndex = this.selectedElems[this.selectedElems.length - 1]?.getZIndex() ?? 0;
|
177
|
+
const targetHighestZIndex = lowestVisibleZIndex - 1;
|
178
|
+
const deltaZIndex = targetHighestZIndex - highestSelectedZIndex;
|
179
|
+
if (deltaZIndex !== 0) {
|
180
|
+
const commands = this.selectedElems.map((elem) => {
|
181
|
+
return elem.setZIndex(elem.getZIndex() + deltaZIndex);
|
182
|
+
});
|
183
|
+
return uniteCommands(commands, updateChunkSize);
|
184
|
+
}
|
185
|
+
return null;
|
186
|
+
}
|
187
|
+
// Preview the effects of the current transformation on the selection
|
188
|
+
previewTransformCmds() {
|
189
|
+
if (this.selectedElems.length === 0) {
|
190
|
+
return;
|
191
|
+
}
|
192
|
+
// Don't render what we're moving if it's likely to be slow.
|
193
|
+
if (this.selectedElems.length > maxPreviewElemCount) {
|
194
|
+
this.updateUI();
|
195
|
+
return;
|
196
|
+
}
|
197
|
+
const wetInkRenderer = this.editor.display.getWetInkRenderer();
|
198
|
+
wetInkRenderer.clear();
|
199
|
+
wetInkRenderer.pushTransform(this.transform);
|
200
|
+
const viewportVisibleRect = this.editor.viewport.visibleRect.union(this.region);
|
201
|
+
const visibleRect = viewportVisibleRect.transformedBoundingBox(this.transform.inverse());
|
202
|
+
for (const elem of this.selectedElems) {
|
203
|
+
elem.render(wetInkRenderer, visibleRect);
|
204
|
+
}
|
205
|
+
wetInkRenderer.popTransform();
|
206
|
+
this.updateUI();
|
207
|
+
}
|
208
|
+
// Find the objects corresponding to this in the document,
|
209
|
+
// select them.
|
210
|
+
// Returns false iff nothing was selected.
|
211
|
+
resolveToObjects() {
|
212
|
+
let singleItemSelectionMode = false;
|
213
|
+
this.transform = Mat33.identity;
|
214
|
+
// Grow the rectangle, if necessary
|
215
|
+
if (this.region.w === 0 || this.region.h === 0) {
|
216
|
+
const padding = this.editor.viewport.visibleRect.maxDimension / 200;
|
217
|
+
this.originalRegion = Rect2.bboxOf(this.region.corners, padding);
|
218
|
+
// Only select one item if the rectangle was very small.
|
219
|
+
singleItemSelectionMode = true;
|
220
|
+
}
|
221
|
+
this.selectedElems = this.editor.image
|
222
|
+
.getElementsIntersectingRegion(this.region)
|
223
|
+
.filter((elem) => {
|
224
|
+
return elem.intersectsRect(this.region) && elem.isSelectable();
|
225
|
+
});
|
226
|
+
if (singleItemSelectionMode && this.selectedElems.length > 0) {
|
227
|
+
this.selectedElems = [this.selectedElems[this.selectedElems.length - 1]];
|
228
|
+
}
|
229
|
+
// Find the bounding box of all selected elements.
|
230
|
+
if (!this.recomputeRegion()) {
|
231
|
+
return false;
|
232
|
+
}
|
233
|
+
this.updateUI();
|
234
|
+
return true;
|
235
|
+
}
|
236
|
+
// Recompute this' region from the selected elements.
|
237
|
+
// Returns false if the selection is empty.
|
238
|
+
recomputeRegion() {
|
239
|
+
const newRegion = this.computeTightBoundingBox();
|
240
|
+
this.selectionTightBoundingBox = newRegion;
|
241
|
+
if (!newRegion) {
|
242
|
+
this.cancelSelection();
|
243
|
+
return false;
|
244
|
+
}
|
245
|
+
this.originalRegion = newRegion;
|
246
|
+
this.padRegion();
|
247
|
+
return true;
|
248
|
+
}
|
249
|
+
// Applies padding to the current region if it is too small.
|
250
|
+
// @internal
|
251
|
+
padRegion() {
|
252
|
+
const sourceRegion = this.selectionTightBoundingBox ?? this.originalRegion;
|
253
|
+
const minSize = this.getMinCanvasSize();
|
254
|
+
if (sourceRegion.w < minSize || sourceRegion.h < minSize) {
|
255
|
+
// Add padding
|
256
|
+
const padding = minSize / 2;
|
257
|
+
this.originalRegion = Rect2.bboxOf(sourceRegion.corners, padding);
|
258
|
+
this.updateUI();
|
259
|
+
}
|
260
|
+
}
|
261
|
+
getMinCanvasSize() {
|
262
|
+
const canvasHandleSize = handleSize / this.editor.viewport.getScaleFactor();
|
263
|
+
return canvasHandleSize * 2;
|
264
|
+
}
|
265
|
+
getSelectedItemCount() {
|
266
|
+
return this.selectedElems.length;
|
267
|
+
}
|
268
|
+
// @internal
|
269
|
+
updateUI() {
|
270
|
+
// Don't update old selections.
|
271
|
+
if (!this.hasParent) {
|
272
|
+
return;
|
273
|
+
}
|
274
|
+
const screenRegion = this.getScreenRegion();
|
275
|
+
// marginLeft, marginTop: Display relative to the top left of the selection overlay.
|
276
|
+
// left, top don't work for this.
|
277
|
+
this.backgroundElem.style.marginLeft = `${screenRegion.topLeft.x}px`;
|
278
|
+
this.backgroundElem.style.marginTop = `${screenRegion.topLeft.y}px`;
|
279
|
+
this.backgroundElem.style.width = `${screenRegion.width}px`;
|
280
|
+
this.backgroundElem.style.height = `${screenRegion.height}px`;
|
281
|
+
const rotationDeg = (this.screenRegionRotation * 180) / Math.PI;
|
282
|
+
this.backgroundElem.style.transform = `rotate(${rotationDeg}deg)`;
|
283
|
+
this.backgroundElem.style.transformOrigin = 'center';
|
284
|
+
// If closer to perpendicular, apply different CSS
|
285
|
+
const perpendicularClassName = `${cssPrefix}rotated-near-perpendicular`;
|
286
|
+
if (Math.abs(Math.sin(this.screenRegionRotation)) > 0.5) {
|
287
|
+
this.innerContainer.classList.add(perpendicularClassName);
|
288
|
+
}
|
289
|
+
else {
|
290
|
+
this.innerContainer.classList.remove(perpendicularClassName);
|
291
|
+
}
|
292
|
+
// Hide handles when empty
|
293
|
+
if (screenRegion.width === 0 && screenRegion.height === 0) {
|
294
|
+
this.innerContainer.classList.add('-empty');
|
295
|
+
}
|
296
|
+
else {
|
297
|
+
this.innerContainer.classList.remove('-empty');
|
298
|
+
}
|
299
|
+
for (const widget of this.childwidgets) {
|
300
|
+
widget.updatePosition(this.getScreenRegion());
|
301
|
+
}
|
302
|
+
}
|
303
|
+
// Add/remove the contents of this seleciton from the editor.
|
304
|
+
// Used to prevent previewed content from looking like duplicate content
|
305
|
+
// while dragging.
|
306
|
+
//
|
307
|
+
// Does nothing if a large number of elements are selected (and so modifying
|
308
|
+
// the editor image is likely to be slow.)
|
309
|
+
//
|
310
|
+
// If removed from the image, selected elements are drawn as wet ink.
|
311
|
+
//
|
312
|
+
// [inImage] should be `true` if the selected elements should be added to the
|
313
|
+
// main image, `false` if they should be removed.
|
314
|
+
addRemoveSelectionFromImage(inImage) {
|
315
|
+
// Don't hide elements if doing so will be slow.
|
316
|
+
if (!inImage && this.selectedElems.length > maxPreviewElemCount) {
|
317
|
+
return;
|
318
|
+
}
|
319
|
+
for (const elem of this.selectedElems) {
|
320
|
+
const parent = this.editor.image.findParent(elem);
|
321
|
+
if (!inImage && parent) {
|
322
|
+
this.removedFromImage[elem.getId()] = true;
|
323
|
+
parent.remove();
|
324
|
+
}
|
325
|
+
// If we're making things visible and the selected object wasn't previously
|
326
|
+
// visible,
|
327
|
+
else if (!parent && this.removedFromImage[elem.getId()]) {
|
328
|
+
EditorImage.addElement(elem).apply(this.editor);
|
329
|
+
this.removedFromImage[elem.getId()] = false;
|
330
|
+
delete this.removedFromImage[elem.getId()];
|
331
|
+
}
|
332
|
+
}
|
333
|
+
// Don't await queueRerender. If we're running in a test, the re-render might never
|
334
|
+
// happen.
|
335
|
+
this.editor.queueRerender().then(() => {
|
336
|
+
if (!inImage) {
|
337
|
+
this.previewTransformCmds();
|
338
|
+
}
|
339
|
+
else {
|
340
|
+
// Clear renderings of any in-progress transformations
|
341
|
+
const wetInkRenderer = this.editor.display.getWetInkRenderer();
|
342
|
+
wetInkRenderer.clear();
|
343
|
+
}
|
344
|
+
});
|
345
|
+
}
|
346
|
+
removeDeletedElemsFromSelection() {
|
347
|
+
// Remove any deleted elements from the selection.
|
348
|
+
this.selectedElems = this.selectedElems.filter((elem) => {
|
349
|
+
const hasParent = !!this.editor.image.findParent(elem);
|
350
|
+
// If we removed the element and haven't added it back yet, don't remove it
|
351
|
+
// from the selection.
|
352
|
+
const weRemoved = this.removedFromImage[elem.getId()];
|
353
|
+
return hasParent || weRemoved;
|
354
|
+
});
|
355
|
+
}
|
356
|
+
onDragStart(pointer) {
|
357
|
+
// Clear the HTML selection (prevent HTML drag and drop being triggered by this drag)
|
358
|
+
document.getSelection()?.removeAllRanges();
|
359
|
+
this.activeHandle = null;
|
360
|
+
let result = false;
|
361
|
+
this.backgroundDragging = false;
|
362
|
+
if (this.region.containsPoint(pointer.canvasPos)) {
|
363
|
+
this.backgroundDragging = true;
|
364
|
+
result = true;
|
365
|
+
}
|
366
|
+
for (const widget of this.childwidgets) {
|
367
|
+
if (widget.containsPoint(pointer.canvasPos)) {
|
368
|
+
this.activeHandle = widget;
|
369
|
+
this.backgroundDragging = false;
|
370
|
+
result = true;
|
371
|
+
}
|
372
|
+
}
|
373
|
+
if (result) {
|
374
|
+
this.removeDeletedElemsFromSelection();
|
375
|
+
this.addRemoveSelectionFromImage(false);
|
376
|
+
}
|
377
|
+
if (this.activeHandle) {
|
378
|
+
this.activeHandle.handleDragStart(pointer);
|
379
|
+
}
|
380
|
+
if (this.backgroundDragging) {
|
381
|
+
this.transformers.drag.onDragStart(pointer.canvasPos);
|
382
|
+
}
|
383
|
+
return result;
|
384
|
+
}
|
385
|
+
onDragUpdate(pointer) {
|
386
|
+
if (this.backgroundDragging) {
|
387
|
+
this.transformers.drag.onDragUpdate(pointer.canvasPos);
|
388
|
+
}
|
389
|
+
if (this.activeHandle) {
|
390
|
+
this.activeHandle.handleDragUpdate(pointer);
|
391
|
+
}
|
392
|
+
}
|
393
|
+
onDragEnd() {
|
394
|
+
if (this.backgroundDragging) {
|
395
|
+
this.transformers.drag.onDragEnd();
|
396
|
+
}
|
397
|
+
else if (this.activeHandle) {
|
398
|
+
this.activeHandle.handleDragEnd();
|
399
|
+
}
|
400
|
+
this.addRemoveSelectionFromImage(true);
|
401
|
+
this.backgroundDragging = false;
|
402
|
+
this.activeHandle = null;
|
403
|
+
this.updateUI();
|
404
|
+
}
|
405
|
+
onDragCancel() {
|
406
|
+
this.backgroundDragging = false;
|
407
|
+
this.activeHandle = null;
|
408
|
+
this.setTransform(Mat33.identity);
|
409
|
+
this.addRemoveSelectionFromImage(true);
|
410
|
+
this.updateUI();
|
411
|
+
}
|
412
|
+
// Scroll the viewport to this. Does not zoom
|
413
|
+
scrollTo() {
|
414
|
+
if (this.selectedElems.length === 0) {
|
415
|
+
return false;
|
416
|
+
}
|
417
|
+
const screenSize = this.editor.viewport.getScreenRectSize();
|
418
|
+
const screenRect = new Rect2(0, 0, screenSize.x, screenSize.y);
|
419
|
+
const selectionScreenRegion = this.getScreenRegion();
|
420
|
+
if (!screenRect.containsPoint(selectionScreenRegion.center)) {
|
421
|
+
const targetPointScreen = selectionScreenRegion.center;
|
422
|
+
const closestPointScreen = screenRect.getClosestPointOnBoundaryTo(targetPointScreen);
|
423
|
+
const closestPointCanvas = this.editor.viewport.screenToCanvas(closestPointScreen);
|
424
|
+
const targetPointCanvas = this.region.center;
|
425
|
+
const delta = closestPointCanvas.minus(targetPointCanvas);
|
426
|
+
this.editor.dispatchNoAnnounce(Viewport.transformBy(Mat33.translation(delta.times(0.5))), false);
|
427
|
+
this.editor.queueRerender().then(() => {
|
428
|
+
this.previewTransformCmds();
|
429
|
+
});
|
430
|
+
return true;
|
431
|
+
}
|
432
|
+
return false;
|
433
|
+
}
|
434
|
+
deleteSelectedObjects() {
|
435
|
+
if (this.backgroundDragging || this.activeHandle) {
|
436
|
+
this.onDragEnd();
|
437
|
+
}
|
438
|
+
return new Erase(this.selectedElems);
|
439
|
+
}
|
440
|
+
runSelectionDuplicatedAnimation() {
|
441
|
+
if (this.selectionDuplicatedAnimationTimeout) {
|
442
|
+
clearTimeout(this.selectionDuplicatedAnimationTimeout);
|
443
|
+
}
|
444
|
+
const animationDuration = 400; // ms
|
445
|
+
this.backgroundElem.style.animation = `${animationDuration}ms ease selection-duplicated-animation`;
|
446
|
+
this.selectionDuplicatedAnimationTimeout = setTimeout(() => {
|
447
|
+
this.backgroundElem.style.animation = '';
|
448
|
+
this.selectionDuplicatedAnimationTimeout = null;
|
449
|
+
}, animationDuration);
|
450
|
+
}
|
451
|
+
async duplicateSelectedObjects() {
|
452
|
+
const wasTransforming = this.backgroundDragging || this.activeHandle;
|
453
|
+
let tmpApplyCommand = null;
|
454
|
+
if (!wasTransforming) {
|
455
|
+
this.runSelectionDuplicatedAnimation();
|
456
|
+
}
|
457
|
+
if (wasTransforming) {
|
458
|
+
// Don't update the selection's focus when redoing/undoing
|
459
|
+
const selectionToUpdate = null;
|
460
|
+
const deltaZIndex = this.getDeltaZIndexToMoveSelectionToTop();
|
461
|
+
tmpApplyCommand = new _a.ApplyTransformationCommand(selectionToUpdate, this.selectedElems, this.transform, deltaZIndex);
|
462
|
+
// Transform to ensure that the duplicates are in the correct location
|
463
|
+
await tmpApplyCommand.apply(this.editor);
|
464
|
+
// Show items again
|
465
|
+
this.addRemoveSelectionFromImage(true);
|
466
|
+
}
|
467
|
+
const duplicateCommand = new Duplicate(this.selectedElems);
|
468
|
+
if (wasTransforming) {
|
469
|
+
// Move the selected objects back to the correct location.
|
470
|
+
await tmpApplyCommand?.unapply(this.editor);
|
471
|
+
this.addRemoveSelectionFromImage(false);
|
472
|
+
this.previewTransformCmds();
|
473
|
+
this.updateUI();
|
474
|
+
}
|
475
|
+
return duplicateCommand;
|
476
|
+
}
|
477
|
+
setHandlesVisible(showHandles) {
|
478
|
+
if (!showHandles) {
|
479
|
+
this.innerContainer.classList.add('-hide-handles');
|
480
|
+
}
|
481
|
+
else {
|
482
|
+
this.innerContainer.classList.remove('-hide-handles');
|
483
|
+
}
|
484
|
+
}
|
485
|
+
addTo(elem) {
|
486
|
+
if (this.outerContainer.parentElement) {
|
487
|
+
this.outerContainer.remove();
|
488
|
+
}
|
489
|
+
elem.appendChild(this.outerContainer);
|
490
|
+
this.hasParent = true;
|
491
|
+
}
|
492
|
+
setToPoint(point) {
|
493
|
+
this.originalRegion = this.originalRegion.grownToPoint(point);
|
494
|
+
this.selectionTightBoundingBox = null;
|
495
|
+
this.updateUI();
|
496
|
+
}
|
497
|
+
cancelSelection() {
|
498
|
+
if (this.outerContainer.parentElement) {
|
499
|
+
this.outerContainer.remove();
|
500
|
+
}
|
501
|
+
this.originalRegion = Rect2.empty;
|
502
|
+
this.selectionTightBoundingBox = null;
|
503
|
+
this.hasParent = false;
|
504
|
+
}
|
505
|
+
setSelectedObjects(objects, bbox) {
|
506
|
+
this.addRemoveSelectionFromImage(true);
|
507
|
+
this.originalRegion = bbox;
|
508
|
+
this.selectionTightBoundingBox = bbox;
|
509
|
+
this.selectedElems = objects.filter((object) => object.isSelectable());
|
510
|
+
// Enforce increasing z-index invariant
|
511
|
+
this.selectedElems.sort((a, b) => a.getZIndex() - b.getZIndex());
|
512
|
+
this.padRegion();
|
513
|
+
this.updateUI();
|
514
|
+
}
|
515
|
+
getSelectedObjects() {
|
516
|
+
return [...this.selectedElems];
|
517
|
+
}
|
518
|
+
}
|
519
|
+
_a = Selection;
|
520
|
+
(() => {
|
521
|
+
SerializableCommand.register('selection-tool-transform', (json, _editor) => {
|
522
|
+
// The selection box is lost when serializing/deserializing. No need to store box rotation
|
523
|
+
const fullTransform = new Mat33(...json.transform);
|
524
|
+
const elemIds = json.elems ?? [];
|
525
|
+
const deltaZIndex = parseInt(json.deltaZIndex ?? 0);
|
526
|
+
return new _a.ApplyTransformationCommand(null, elemIds, fullTransform, deltaZIndex);
|
527
|
+
});
|
528
|
+
})();
|
529
|
+
Selection.ApplyTransformationCommand = class extends SerializableCommand {
|
530
|
+
constructor(selection,
|
531
|
+
// If a `string[]`, selectedElems is a list of element IDs.
|
532
|
+
selectedElems,
|
533
|
+
// Full transformation used to transform elements.
|
534
|
+
fullTransform, deltaZIndex) {
|
535
|
+
super('selection-tool-transform');
|
536
|
+
this.selection = selection;
|
537
|
+
this.fullTransform = fullTransform;
|
538
|
+
this.deltaZIndex = deltaZIndex;
|
539
|
+
const isIDList = (arr) => {
|
540
|
+
return typeof arr[0] === 'string';
|
541
|
+
};
|
542
|
+
// If a list of element IDs,
|
543
|
+
if (isIDList(selectedElems)) {
|
544
|
+
this.selectedElemIds = selectedElems;
|
545
|
+
}
|
546
|
+
else {
|
547
|
+
this.selectedElemIds = selectedElems.map((elem) => elem.getId());
|
548
|
+
this.transformCommands = selectedElems.map((elem) => {
|
549
|
+
return elem.setZIndexAndTransformBy(this.fullTransform, elem.getZIndex() + deltaZIndex);
|
550
|
+
});
|
551
|
+
}
|
552
|
+
}
|
553
|
+
resolveToElems(editor, isUndoing) {
|
554
|
+
if (this.transformCommands) {
|
555
|
+
return;
|
556
|
+
}
|
557
|
+
this.transformCommands = this.selectedElemIds
|
558
|
+
.map((id) => {
|
559
|
+
const elem = editor.image.lookupElement(id);
|
560
|
+
if (!elem) {
|
561
|
+
// There may be valid reasons for an element lookup to fail:
|
562
|
+
// For example, if the element was deleted remotely and the remote deletion
|
563
|
+
// hasn't been undone.
|
564
|
+
console.warn(`Unable to find element with ID, ${id}.`);
|
565
|
+
return null;
|
566
|
+
}
|
567
|
+
let originalZIndex = elem.getZIndex();
|
568
|
+
let targetZIndex = elem.getZIndex() + this.deltaZIndex;
|
569
|
+
// If the command has already been applied, the element should currently
|
570
|
+
// have the target z-index.
|
571
|
+
if (isUndoing) {
|
572
|
+
targetZIndex = elem.getZIndex();
|
573
|
+
originalZIndex = elem.getZIndex() - this.deltaZIndex;
|
574
|
+
}
|
575
|
+
return elem.setZIndexAndTransformBy(this.fullTransform, targetZIndex, originalZIndex);
|
576
|
+
})
|
577
|
+
.filter(
|
578
|
+
// Remove all null commands
|
579
|
+
(command) => command !== null);
|
580
|
+
}
|
581
|
+
async apply(editor) {
|
582
|
+
this.resolveToElems(editor, false);
|
583
|
+
this.selection?.setTransform(this.fullTransform, false);
|
584
|
+
this.selection?.updateUI();
|
585
|
+
await editor.asyncApplyCommands(this.transformCommands, updateChunkSize);
|
586
|
+
this.selection?.setTransform(Mat33.identity, false);
|
587
|
+
this.selection?.recomputeRegion();
|
588
|
+
this.selection?.updateUI();
|
589
|
+
}
|
590
|
+
async unapply(editor) {
|
591
|
+
this.resolveToElems(editor, true);
|
592
|
+
this.selection?.setTransform(this.fullTransform.inverse(), false);
|
593
|
+
this.selection?.updateUI();
|
594
|
+
await editor.asyncUnapplyCommands(this.transformCommands, updateChunkSize, true);
|
595
|
+
this.selection?.setTransform(Mat33.identity, false);
|
596
|
+
this.selection?.recomputeRegion();
|
597
|
+
this.selection?.updateUI();
|
598
|
+
}
|
599
|
+
serializeToJSON() {
|
600
|
+
return {
|
601
|
+
elems: this.selectedElemIds,
|
602
|
+
transform: this.fullTransform.toArray(),
|
603
|
+
deltaZIndex: this.deltaZIndex,
|
604
|
+
};
|
605
|
+
}
|
606
|
+
description(_editor, localizationTable) {
|
607
|
+
return localizationTable.transformedElements(this.selectedElemIds.length);
|
608
|
+
}
|
609
|
+
};
|
610
|
+
export default Selection;
|
@@ -0,0 +1,62 @@
|
|
1
|
+
import { Point2, Vec2 } from '@js-draw/math';
|
2
|
+
import Selection from './Selection';
|
3
|
+
import Pointer from '../../Pointer';
|
4
|
+
import Viewport from '../../Viewport';
|
5
|
+
import { SelectionBoxChild } from './types';
|
6
|
+
export declare enum HandleAction {
|
7
|
+
ResizeXY = "resize-xy",
|
8
|
+
Rotate = "rotate",
|
9
|
+
ResizeX = "resize-x",
|
10
|
+
ResizeY = "resize-y"
|
11
|
+
}
|
12
|
+
export interface HandlePresentation {
|
13
|
+
side: Vec2;
|
14
|
+
icon?: Element;
|
15
|
+
action: HandleAction;
|
16
|
+
}
|
17
|
+
export declare const handleSize = 30;
|
18
|
+
export type DragStartCallback = (startPoint: Point2) => void;
|
19
|
+
export type DragUpdateCallback = (canvasPoint: Point2) => void;
|
20
|
+
export type DragEndCallback = () => Promise<void> | void;
|
21
|
+
export default class SelectionHandle implements SelectionBoxChild {
|
22
|
+
readonly presentation: HandlePresentation;
|
23
|
+
private readonly parent;
|
24
|
+
private readonly viewport;
|
25
|
+
private readonly onDragStart;
|
26
|
+
private readonly onDragUpdate;
|
27
|
+
private readonly onDragEnd;
|
28
|
+
private element;
|
29
|
+
private snapToGrid;
|
30
|
+
private shape;
|
31
|
+
private parentSide;
|
32
|
+
constructor(presentation: HandlePresentation, parent: Selection, viewport: Viewport, onDragStart: DragStartCallback, onDragUpdate: DragUpdateCallback, onDragEnd: DragEndCallback);
|
33
|
+
/**
|
34
|
+
* Adds this to `container`, where `conatiner` should be the background/selection
|
35
|
+
* element visible on the screen.
|
36
|
+
*/
|
37
|
+
addTo(container: HTMLElement): void;
|
38
|
+
/**
|
39
|
+
* Removes this element from its container. Should only be called
|
40
|
+
* after {@link addTo}.
|
41
|
+
*/
|
42
|
+
remove(): void;
|
43
|
+
/**
|
44
|
+
* Returns this handle's bounding box relative to the top left of the
|
45
|
+
* selection box.
|
46
|
+
*/
|
47
|
+
private getBBoxParentCoords;
|
48
|
+
/** @returns this handle's bounding box relative to the canvas. */
|
49
|
+
private getBBoxCanvasCoords;
|
50
|
+
/**
|
51
|
+
* Moves the HTML representation of this to the location matching its internal representation.
|
52
|
+
*/
|
53
|
+
updatePosition(): void;
|
54
|
+
/** @returns true iff `point` (in editor **canvas** coordinates) is in this. */
|
55
|
+
containsPoint(point: Point2): boolean;
|
56
|
+
private dragLastPos;
|
57
|
+
handleDragStart(pointer: Pointer): boolean;
|
58
|
+
handleDragUpdate(pointer: Pointer): void;
|
59
|
+
handleDragEnd(): void | Promise<void>;
|
60
|
+
setSnapToGrid(snap: boolean): void;
|
61
|
+
isSnappingToGrid(): boolean;
|
62
|
+
}
|