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,125 @@
|
|
1
|
+
import { Editor } from '../Editor';
|
2
|
+
import { Point2 } from '@js-draw/math';
|
3
|
+
import Pointer from '../Pointer';
|
4
|
+
import { KeyPressEvent, PointerEvt, WheelEvt } from '../inputEvents';
|
5
|
+
import BaseTool from './BaseTool';
|
6
|
+
interface PinchData {
|
7
|
+
canvasCenter: Point2;
|
8
|
+
screenCenter: Point2;
|
9
|
+
angle: number;
|
10
|
+
dist: number;
|
11
|
+
}
|
12
|
+
export declare enum PanZoomMode {
|
13
|
+
/** Touch gestures with a single pointer. Ignores non-touch gestures. */
|
14
|
+
OneFingerTouchGestures = 1,
|
15
|
+
/** Touch gestures with exactly two pointers. Ignores non-touch gestures. */
|
16
|
+
TwoFingerTouchGestures = 2,
|
17
|
+
RightClickDrags = 4,
|
18
|
+
/** Single-pointer gestures of *any* type (including touch). */
|
19
|
+
SinglePointerGestures = 8,
|
20
|
+
/** Keyboard navigation (e.g. LeftArrow to move left). */
|
21
|
+
Keyboard = 16,
|
22
|
+
/** If provided, prevents **this** tool from rotating the viewport (other tools may still do so). */
|
23
|
+
RotationLocked = 32
|
24
|
+
}
|
25
|
+
/**
|
26
|
+
* This tool moves the viewport in response to touchpad, touchscreen, mouse, and keyboard events.
|
27
|
+
*
|
28
|
+
* Which events are handled, and which are skipped, are determined by the tool's `mode`. For example,
|
29
|
+
* a `PanZoom` tool with `mode = PanZoomMode.TwoFingerTouchGestures|PanZoomMode.RightClickDrags` would
|
30
|
+
* respond to right-click drag events and two-finger touch gestures.
|
31
|
+
*
|
32
|
+
* @see {@link setModeEnabled}
|
33
|
+
*/
|
34
|
+
export default class PanZoom extends BaseTool {
|
35
|
+
private editor;
|
36
|
+
private mode;
|
37
|
+
private transform;
|
38
|
+
private readonly initialRotationSnapAngle;
|
39
|
+
private readonly afterRotationStartSnapAngle;
|
40
|
+
private readonly pinchZoomStartThreshold;
|
41
|
+
private startTouchDist;
|
42
|
+
private lastTouchDist;
|
43
|
+
private lastScreenCenter;
|
44
|
+
private lastTimestamp;
|
45
|
+
private lastPointerDownTimestamp;
|
46
|
+
private initialTouchAngle;
|
47
|
+
private initialViewportRotation;
|
48
|
+
private initialViewportScale;
|
49
|
+
private isScaling;
|
50
|
+
private isRotating;
|
51
|
+
private inertialScroller;
|
52
|
+
private velocity;
|
53
|
+
constructor(editor: Editor, mode: PanZoomMode, description: string);
|
54
|
+
canReceiveInputInReadOnlyEditor(): boolean;
|
55
|
+
computePinchData(p1: Pointer, p2: Pointer): PinchData;
|
56
|
+
private allPointersAreOfType;
|
57
|
+
onPointerDown({ allPointers: pointers, current: currentPointer, }: PointerEvt): boolean;
|
58
|
+
private updateVelocity;
|
59
|
+
private getCenterDelta;
|
60
|
+
private toSnappedRotationDelta;
|
61
|
+
/**
|
62
|
+
* Given a scale update, `scaleFactor`, returns a new scale factor snapped
|
63
|
+
* to a power of two (if within some tolerance of that scale).
|
64
|
+
*/
|
65
|
+
private toSnappedScaleFactor;
|
66
|
+
private handleTwoFingerMove;
|
67
|
+
private handleOneFingerMove;
|
68
|
+
onPointerMove({ allPointers }: PointerEvt): void;
|
69
|
+
onPointerUp(event: PointerEvt): void;
|
70
|
+
onGestureCancel(): void;
|
71
|
+
private updateTransform;
|
72
|
+
/**
|
73
|
+
* Updates the current transform and clears it. Use this method for events that are not part of
|
74
|
+
* a larger gesture (i.e. have no start and end event). For example, this would be used for `onwheel`
|
75
|
+
* events, but not for `onpointer` events.
|
76
|
+
*/
|
77
|
+
private applyAndFinalizeTransform;
|
78
|
+
onWheel({ delta, screenPos }: WheelEvt): boolean;
|
79
|
+
onKeyPress(event: KeyPressEvent): boolean;
|
80
|
+
private isRotationLocked;
|
81
|
+
/**
|
82
|
+
* Changes the types of gestures used by this pan/zoom tool.
|
83
|
+
*
|
84
|
+
* @see {@link PanZoomMode} {@link setMode}
|
85
|
+
*
|
86
|
+
* @example
|
87
|
+
* ```ts,runnable
|
88
|
+
* import { Editor, PanZoomTool, PanZoomMode } from 'js-draw';
|
89
|
+
*
|
90
|
+
* const editor = new Editor(document.body);
|
91
|
+
*
|
92
|
+
* // By default, there are multiple PanZoom tools that handle different events.
|
93
|
+
* // This gets all PanZoomTools.
|
94
|
+
* const panZoomToolList = editor.toolController.getMatchingTools(PanZoomTool);
|
95
|
+
*
|
96
|
+
* // The first PanZoomTool is the highest priority -- by default,
|
97
|
+
* // this tool is responsible for handling multi-finger touch gestures.
|
98
|
+
* //
|
99
|
+
* // Lower-priority PanZoomTools handle one-finger touch gestures and
|
100
|
+
* // key-presses.
|
101
|
+
* const panZoomTool = panZoomToolList[0];
|
102
|
+
*
|
103
|
+
* // Lock rotation for multi-finger touch gestures.
|
104
|
+
* panZoomTool.setModeEnabled(PanZoomMode.RotationLocked, true);
|
105
|
+
* ```
|
106
|
+
*/
|
107
|
+
setModeEnabled(mode: PanZoomMode, enabled: boolean): void;
|
108
|
+
/**
|
109
|
+
* Sets all modes for this tool using a bitmask.
|
110
|
+
*
|
111
|
+
* @see {@link setModeEnabled}
|
112
|
+
*
|
113
|
+
* @example
|
114
|
+
* ```ts
|
115
|
+
* tool.setMode(PanZoomMode.RotationLocked|PanZoomMode.TwoFingerTouchGestures);
|
116
|
+
* ```
|
117
|
+
*/
|
118
|
+
setMode(mode: PanZoomMode): void;
|
119
|
+
/**
|
120
|
+
* Returns a bitmask indicating the currently-enabled modes.
|
121
|
+
* @see {@link setModeEnabled}
|
122
|
+
*/
|
123
|
+
getMode(): PanZoomMode;
|
124
|
+
}
|
125
|
+
export {};
|
@@ -0,0 +1,515 @@
|
|
1
|
+
import { Mat33, Vec3, Vec2 } from '@js-draw/math';
|
2
|
+
import { PointerDevice } from '../Pointer.mjs';
|
3
|
+
import { EditorEventType } from '../types.mjs';
|
4
|
+
import untilNextAnimationFrame from '../util/untilNextAnimationFrame.mjs';
|
5
|
+
import { Viewport } from '../Viewport.mjs';
|
6
|
+
import BaseTool from './BaseTool.mjs';
|
7
|
+
import { moveDownKeyboardShortcutId, moveLeftKeyboardShortcutId, moveRightKeyboardShortcutId, moveUpKeyboardShortcutId, rotateClockwiseKeyboardShortcutId, rotateCounterClockwiseKeyboardShortcutId, zoomInKeyboardShortcutId, zoomOutKeyboardShortcutId, } from './keybindings.mjs';
|
8
|
+
export var PanZoomMode;
|
9
|
+
(function (PanZoomMode) {
|
10
|
+
/** Touch gestures with a single pointer. Ignores non-touch gestures. */
|
11
|
+
PanZoomMode[PanZoomMode["OneFingerTouchGestures"] = 1] = "OneFingerTouchGestures";
|
12
|
+
/** Touch gestures with exactly two pointers. Ignores non-touch gestures. */
|
13
|
+
PanZoomMode[PanZoomMode["TwoFingerTouchGestures"] = 2] = "TwoFingerTouchGestures";
|
14
|
+
PanZoomMode[PanZoomMode["RightClickDrags"] = 4] = "RightClickDrags";
|
15
|
+
/** Single-pointer gestures of *any* type (including touch). */
|
16
|
+
PanZoomMode[PanZoomMode["SinglePointerGestures"] = 8] = "SinglePointerGestures";
|
17
|
+
/** Keyboard navigation (e.g. LeftArrow to move left). */
|
18
|
+
PanZoomMode[PanZoomMode["Keyboard"] = 16] = "Keyboard";
|
19
|
+
/** If provided, prevents **this** tool from rotating the viewport (other tools may still do so). */
|
20
|
+
PanZoomMode[PanZoomMode["RotationLocked"] = 32] = "RotationLocked";
|
21
|
+
})(PanZoomMode || (PanZoomMode = {}));
|
22
|
+
class InertialScroller {
|
23
|
+
constructor(initialVelocity, scrollBy, onComplete) {
|
24
|
+
this.initialVelocity = initialVelocity;
|
25
|
+
this.scrollBy = scrollBy;
|
26
|
+
this.onComplete = onComplete;
|
27
|
+
this.running = false;
|
28
|
+
this.start();
|
29
|
+
}
|
30
|
+
async start() {
|
31
|
+
if (this.running) {
|
32
|
+
return;
|
33
|
+
}
|
34
|
+
this.currentVelocity = this.initialVelocity;
|
35
|
+
let lastTime = performance.now();
|
36
|
+
this.running = true;
|
37
|
+
const maxSpeed = 5000; // units/s
|
38
|
+
const minSpeed = 200; // units/s
|
39
|
+
if (this.currentVelocity.magnitude() > maxSpeed) {
|
40
|
+
this.currentVelocity = this.currentVelocity.normalized().times(maxSpeed);
|
41
|
+
}
|
42
|
+
while (this.running && this.currentVelocity.magnitude() > minSpeed) {
|
43
|
+
const nowTime = performance.now();
|
44
|
+
const dt = (nowTime - lastTime) / 1000;
|
45
|
+
this.currentVelocity = this.currentVelocity.times(Math.pow(1 / 8, dt));
|
46
|
+
this.scrollBy(this.currentVelocity.times(dt));
|
47
|
+
await untilNextAnimationFrame();
|
48
|
+
lastTime = nowTime;
|
49
|
+
}
|
50
|
+
if (this.running) {
|
51
|
+
this.stop();
|
52
|
+
}
|
53
|
+
}
|
54
|
+
getCurrentVelocity() {
|
55
|
+
if (!this.running) {
|
56
|
+
return null;
|
57
|
+
}
|
58
|
+
return this.currentVelocity;
|
59
|
+
}
|
60
|
+
stop() {
|
61
|
+
if (this.running) {
|
62
|
+
this.running = false;
|
63
|
+
this.onComplete();
|
64
|
+
}
|
65
|
+
}
|
66
|
+
}
|
67
|
+
/**
|
68
|
+
* This tool moves the viewport in response to touchpad, touchscreen, mouse, and keyboard events.
|
69
|
+
*
|
70
|
+
* Which events are handled, and which are skipped, are determined by the tool's `mode`. For example,
|
71
|
+
* a `PanZoom` tool with `mode = PanZoomMode.TwoFingerTouchGestures|PanZoomMode.RightClickDrags` would
|
72
|
+
* respond to right-click drag events and two-finger touch gestures.
|
73
|
+
*
|
74
|
+
* @see {@link setModeEnabled}
|
75
|
+
*/
|
76
|
+
export default class PanZoom extends BaseTool {
|
77
|
+
constructor(editor, mode, description) {
|
78
|
+
super(editor.notifier, description);
|
79
|
+
this.editor = editor;
|
80
|
+
this.mode = mode;
|
81
|
+
this.transform = null;
|
82
|
+
// Constants
|
83
|
+
// initialRotationSnapAngle is larger than afterRotationStartSnapAngle to
|
84
|
+
// make it more difficult to start rotating (and easier to continue rotating).
|
85
|
+
this.initialRotationSnapAngle = 0.22; // radians
|
86
|
+
this.afterRotationStartSnapAngle = 0.07; // radians
|
87
|
+
this.pinchZoomStartThreshold = 1.08; // scale factor
|
88
|
+
// Last timestamp at which a pointerdown event was received
|
89
|
+
this.lastPointerDownTimestamp = 0;
|
90
|
+
this.initialTouchAngle = 0;
|
91
|
+
this.initialViewportRotation = 0;
|
92
|
+
this.initialViewportScale = 0;
|
93
|
+
// Set to `true` only when scaling has started (if two fingers are down and have moved
|
94
|
+
// far enough).
|
95
|
+
this.isScaling = false;
|
96
|
+
this.isRotating = false;
|
97
|
+
this.inertialScroller = null;
|
98
|
+
this.velocity = null;
|
99
|
+
}
|
100
|
+
// The pan/zoom tool can be used in a read-only editor.
|
101
|
+
canReceiveInputInReadOnlyEditor() {
|
102
|
+
return true;
|
103
|
+
}
|
104
|
+
// Returns information about the pointers in a gesture
|
105
|
+
computePinchData(p1, p2) {
|
106
|
+
// Swap the pointers to ensure consistent ordering.
|
107
|
+
if (p1.id < p2.id) {
|
108
|
+
const tmp = p1;
|
109
|
+
p1 = p2;
|
110
|
+
p2 = tmp;
|
111
|
+
}
|
112
|
+
const screenBetween = p2.screenPos.minus(p1.screenPos);
|
113
|
+
const angle = screenBetween.angle();
|
114
|
+
const dist = screenBetween.magnitude();
|
115
|
+
const canvasCenter = p2.canvasPos.plus(p1.canvasPos).times(0.5);
|
116
|
+
const screenCenter = p2.screenPos.plus(p1.screenPos).times(0.5);
|
117
|
+
return { canvasCenter, screenCenter, angle, dist };
|
118
|
+
}
|
119
|
+
allPointersAreOfType(pointers, kind) {
|
120
|
+
return pointers.every((pointer) => pointer.device === kind);
|
121
|
+
}
|
122
|
+
onPointerDown({ allPointers: pointers, current: currentPointer, }) {
|
123
|
+
let handlingGesture = false;
|
124
|
+
const inertialScrollerVelocity = this.inertialScroller?.getCurrentVelocity() ?? Vec2.zero;
|
125
|
+
this.inertialScroller?.stop();
|
126
|
+
this.velocity = inertialScrollerVelocity;
|
127
|
+
this.lastPointerDownTimestamp = currentPointer.timeStamp;
|
128
|
+
const allAreTouch = this.allPointersAreOfType(pointers, PointerDevice.Touch);
|
129
|
+
const isRightClick = this.allPointersAreOfType(pointers, PointerDevice.RightButtonMouse);
|
130
|
+
if (allAreTouch && pointers.length === 2 && this.mode & PanZoomMode.TwoFingerTouchGestures) {
|
131
|
+
const { screenCenter, angle, dist } = this.computePinchData(pointers[0], pointers[1]);
|
132
|
+
this.lastTouchDist = dist;
|
133
|
+
this.startTouchDist = dist;
|
134
|
+
this.lastScreenCenter = screenCenter;
|
135
|
+
this.initialTouchAngle = angle;
|
136
|
+
this.initialViewportRotation = this.editor.viewport.getRotationAngle();
|
137
|
+
this.initialViewportScale = this.editor.viewport.getScaleFactor();
|
138
|
+
this.isScaling = false;
|
139
|
+
// We're initially rotated if `initialViewportRotation` isn't near a multiple of pi/2.
|
140
|
+
// In other words, if sin(2 initialViewportRotation) is near zero.
|
141
|
+
this.isRotating = Math.abs(Math.sin(this.initialViewportRotation * 2)) > 1e-3;
|
142
|
+
handlingGesture = true;
|
143
|
+
}
|
144
|
+
else if (pointers.length === 1 &&
|
145
|
+
((this.mode & PanZoomMode.OneFingerTouchGestures && allAreTouch) ||
|
146
|
+
(isRightClick && this.mode & PanZoomMode.RightClickDrags) ||
|
147
|
+
this.mode & PanZoomMode.SinglePointerGestures)) {
|
148
|
+
this.lastScreenCenter = pointers[0].screenPos;
|
149
|
+
this.isScaling = false;
|
150
|
+
handlingGesture = true;
|
151
|
+
}
|
152
|
+
if (handlingGesture) {
|
153
|
+
this.lastTimestamp = performance.now();
|
154
|
+
this.transform ??= Viewport.transformBy(Mat33.identity);
|
155
|
+
this.editor.display.setDraftMode(true);
|
156
|
+
}
|
157
|
+
return handlingGesture;
|
158
|
+
}
|
159
|
+
updateVelocity(currentCenter) {
|
160
|
+
const deltaPos = currentCenter.minus(this.lastScreenCenter);
|
161
|
+
let deltaTime = (performance.now() - this.lastTimestamp) / 1000;
|
162
|
+
// Ignore duplicate events, unless there has been enough time between them.
|
163
|
+
if (deltaPos.magnitude() === 0 && deltaTime < 0.1) {
|
164
|
+
return;
|
165
|
+
}
|
166
|
+
// We divide by deltaTime. Don't divide by zero.
|
167
|
+
if (deltaTime === 0) {
|
168
|
+
return;
|
169
|
+
}
|
170
|
+
// Don't divide by almost zero, either
|
171
|
+
deltaTime = Math.max(deltaTime, 0.01);
|
172
|
+
const currentVelocity = deltaPos.times(1 / deltaTime);
|
173
|
+
let smoothedVelocity = currentVelocity;
|
174
|
+
if (this.velocity) {
|
175
|
+
smoothedVelocity = this.velocity.lerp(currentVelocity, 0.5);
|
176
|
+
}
|
177
|
+
this.velocity = smoothedVelocity;
|
178
|
+
}
|
179
|
+
// Returns the change in position of the center of the given group of pointers.
|
180
|
+
// Assumes this.lastScreenCenter has been set appropriately.
|
181
|
+
getCenterDelta(screenCenter) {
|
182
|
+
// Use transformVec3 to avoid translating the delta
|
183
|
+
const delta = this.editor.viewport.screenToCanvasTransform.transformVec3(screenCenter.minus(this.lastScreenCenter));
|
184
|
+
return delta;
|
185
|
+
}
|
186
|
+
// Snaps `angle` to common desired rotations. For example, if `touchAngle` corresponds
|
187
|
+
// to a viewport rotation of 90.1 degrees, this function returns a rotation delta that,
|
188
|
+
// when applied to the viewport, rotates the viewport to 90.0 degrees.
|
189
|
+
//
|
190
|
+
// Returns a snapped rotation delta that, when applied to the viewport, rotates the viewport,
|
191
|
+
// from its position on the last touchDown event, by `touchAngle - initialTouchAngle`.
|
192
|
+
toSnappedRotationDelta(touchAngle) {
|
193
|
+
const deltaAngle = touchAngle - this.initialTouchAngle;
|
194
|
+
let fullRotation = deltaAngle + this.initialViewportRotation;
|
195
|
+
const snapToMultipleOf = Math.PI / 2;
|
196
|
+
const roundedFullRotation = Math.round(fullRotation / snapToMultipleOf) * snapToMultipleOf;
|
197
|
+
// The maximum angle for which we snap the given angle to a multiple of
|
198
|
+
// `snapToMultipleOf`.
|
199
|
+
// Use a smaller snap angle if already rotated (to avoid pinch zoom gestures from
|
200
|
+
// starting rotation).
|
201
|
+
const maxSnapAngle = this.isRotating
|
202
|
+
? this.afterRotationStartSnapAngle
|
203
|
+
: this.initialRotationSnapAngle;
|
204
|
+
// Snap the rotation
|
205
|
+
if (Math.abs(fullRotation - roundedFullRotation) < maxSnapAngle) {
|
206
|
+
fullRotation = roundedFullRotation;
|
207
|
+
// Work around a rotation/matrix multiply bug.
|
208
|
+
// (See commit after 4abe27ff8e7913155828f98dee77b09c57c51d30).
|
209
|
+
// TODO: Fix the underlying issue and remove this.
|
210
|
+
if (fullRotation !== 0) {
|
211
|
+
fullRotation += 0.0001;
|
212
|
+
}
|
213
|
+
}
|
214
|
+
return fullRotation - this.editor.viewport.getRotationAngle();
|
215
|
+
}
|
216
|
+
/**
|
217
|
+
* Given a scale update, `scaleFactor`, returns a new scale factor snapped
|
218
|
+
* to a power of two (if within some tolerance of that scale).
|
219
|
+
*/
|
220
|
+
toSnappedScaleFactor(touchDist) {
|
221
|
+
// scaleFactor is applied to the current transformation of the viewport.
|
222
|
+
const newScale = (this.initialViewportScale * touchDist) / this.startTouchDist;
|
223
|
+
const currentScale = this.editor.viewport.getScaleFactor();
|
224
|
+
const logNewScale = Math.log(newScale) / Math.log(10);
|
225
|
+
const roundedLogNewScale = Math.round(logNewScale);
|
226
|
+
const logTolerance = 0.04;
|
227
|
+
if (Math.abs(roundedLogNewScale - logNewScale) < logTolerance) {
|
228
|
+
return Math.pow(10, roundedLogNewScale) / currentScale;
|
229
|
+
}
|
230
|
+
return touchDist / this.lastTouchDist;
|
231
|
+
}
|
232
|
+
handleTwoFingerMove(allPointers) {
|
233
|
+
const { screenCenter, canvasCenter, angle, dist } = this.computePinchData(allPointers[0], allPointers[1]);
|
234
|
+
const delta = this.getCenterDelta(screenCenter);
|
235
|
+
let deltaRotation;
|
236
|
+
if (this.isRotationLocked()) {
|
237
|
+
deltaRotation = 0;
|
238
|
+
}
|
239
|
+
else {
|
240
|
+
deltaRotation = this.toSnappedRotationDelta(angle);
|
241
|
+
}
|
242
|
+
// If any rotation, make a note of this (affects rotation snap
|
243
|
+
// angles).
|
244
|
+
if (Math.abs(deltaRotation) > 1e-8) {
|
245
|
+
this.isRotating = true;
|
246
|
+
}
|
247
|
+
this.updateVelocity(screenCenter);
|
248
|
+
if (!this.isScaling) {
|
249
|
+
const initialScaleFactor = dist / this.startTouchDist;
|
250
|
+
// Only start scaling if scaling done so far exceeds some threshold.
|
251
|
+
const upperBound = this.pinchZoomStartThreshold;
|
252
|
+
const lowerBound = 1 / this.pinchZoomStartThreshold;
|
253
|
+
if (initialScaleFactor > upperBound || initialScaleFactor < lowerBound) {
|
254
|
+
this.isScaling = true;
|
255
|
+
}
|
256
|
+
}
|
257
|
+
let scaleFactor = 1;
|
258
|
+
if (this.isScaling) {
|
259
|
+
scaleFactor = this.toSnappedScaleFactor(dist);
|
260
|
+
// Don't set lastDist until we start scaling --
|
261
|
+
this.lastTouchDist = dist;
|
262
|
+
}
|
263
|
+
const transformUpdate = Mat33.translation(delta)
|
264
|
+
.rightMul(Mat33.scaling2D(scaleFactor, canvasCenter))
|
265
|
+
.rightMul(Mat33.zRotation(deltaRotation, canvasCenter));
|
266
|
+
this.lastScreenCenter = screenCenter;
|
267
|
+
this.transform = Viewport.transformBy(this.transform.transform.rightMul(transformUpdate));
|
268
|
+
return transformUpdate;
|
269
|
+
}
|
270
|
+
handleOneFingerMove(pointer) {
|
271
|
+
const delta = this.getCenterDelta(pointer.screenPos);
|
272
|
+
const transformUpdate = Mat33.translation(delta);
|
273
|
+
this.transform = Viewport.transformBy(this.transform.transform.rightMul(transformUpdate));
|
274
|
+
this.updateVelocity(pointer.screenPos);
|
275
|
+
this.lastScreenCenter = pointer.screenPos;
|
276
|
+
return transformUpdate;
|
277
|
+
}
|
278
|
+
onPointerMove({ allPointers }) {
|
279
|
+
this.transform ??= Viewport.transformBy(Mat33.identity);
|
280
|
+
let transformUpdate = Mat33.identity;
|
281
|
+
if (allPointers.length === 2) {
|
282
|
+
transformUpdate = this.handleTwoFingerMove(allPointers);
|
283
|
+
}
|
284
|
+
else if (allPointers.length === 1) {
|
285
|
+
transformUpdate = this.handleOneFingerMove(allPointers[0]);
|
286
|
+
}
|
287
|
+
Viewport.transformBy(transformUpdate).apply(this.editor);
|
288
|
+
this.lastTimestamp = performance.now();
|
289
|
+
}
|
290
|
+
onPointerUp(event) {
|
291
|
+
const onComplete = () => {
|
292
|
+
if (this.transform) {
|
293
|
+
this.transform.unapply(this.editor);
|
294
|
+
this.editor.dispatch(this.transform, false);
|
295
|
+
}
|
296
|
+
this.editor.display.setDraftMode(false);
|
297
|
+
this.transform = null;
|
298
|
+
this.velocity = Vec2.zero;
|
299
|
+
};
|
300
|
+
const minInertialScrollDt = 30;
|
301
|
+
const shouldInertialScroll = event.current.device === PointerDevice.Touch &&
|
302
|
+
event.allPointers.length === 1 &&
|
303
|
+
this.velocity !== null &&
|
304
|
+
event.current.timeStamp - this.lastPointerDownTimestamp > minInertialScrollDt;
|
305
|
+
if (shouldInertialScroll && this.velocity !== null) {
|
306
|
+
const oldVelocity = this.velocity;
|
307
|
+
// If the user drags the screen, then stops, then lifts the pointer,
|
308
|
+
// we want the final velocity to reflect the stop at the end (so the velocity
|
309
|
+
// should be near zero). Handle this:
|
310
|
+
this.updateVelocity(event.current.screenPos);
|
311
|
+
// Work around an input issue. Some devices that disable the touchscreen when a stylus
|
312
|
+
// comes near the screen fire a touch-end event at the position of the stylus when a
|
313
|
+
// touch gesture is canceled. Because the stylus is often far away from the last touch,
|
314
|
+
// this causes a great displacement between the second-to-last (from the touchscreen) and
|
315
|
+
// last (from the pen that is now near the screen) events. Only allow velocity to decrease
|
316
|
+
// to work around this:
|
317
|
+
if (oldVelocity.magnitude() < this.velocity.magnitude()) {
|
318
|
+
this.velocity = oldVelocity;
|
319
|
+
}
|
320
|
+
// Cancel any ongoing inertial scrolling.
|
321
|
+
this.inertialScroller?.stop();
|
322
|
+
this.inertialScroller = new InertialScroller(this.velocity, (scrollDelta) => {
|
323
|
+
if (!this.transform) {
|
324
|
+
return;
|
325
|
+
}
|
326
|
+
const canvasDelta = this.editor.viewport.screenToCanvasTransform.transformVec3(scrollDelta);
|
327
|
+
// Scroll by scrollDelta
|
328
|
+
this.transform.unapply(this.editor);
|
329
|
+
this.transform = Viewport.transformBy(this.transform.transform.rightMul(Mat33.translation(canvasDelta)));
|
330
|
+
this.transform.apply(this.editor);
|
331
|
+
}, onComplete);
|
332
|
+
}
|
333
|
+
else {
|
334
|
+
onComplete();
|
335
|
+
}
|
336
|
+
}
|
337
|
+
onGestureCancel() {
|
338
|
+
this.inertialScroller?.stop();
|
339
|
+
this.velocity = Vec2.zero;
|
340
|
+
this.transform?.unapply(this.editor);
|
341
|
+
this.editor.display.setDraftMode(false);
|
342
|
+
this.transform = null;
|
343
|
+
}
|
344
|
+
// Applies [transformUpdate] to the editor. This stacks on top of the
|
345
|
+
// current transformation, if it exists.
|
346
|
+
updateTransform(transformUpdate, announce = false) {
|
347
|
+
let newTransform = transformUpdate;
|
348
|
+
if (this.transform) {
|
349
|
+
newTransform = this.transform.transform.rightMul(transformUpdate);
|
350
|
+
}
|
351
|
+
this.transform?.unapply(this.editor);
|
352
|
+
this.transform = Viewport.transformBy(newTransform);
|
353
|
+
this.transform.apply(this.editor);
|
354
|
+
if (announce) {
|
355
|
+
this.editor.announceForAccessibility(this.transform.description(this.editor, this.editor.localization));
|
356
|
+
}
|
357
|
+
}
|
358
|
+
/**
|
359
|
+
* Updates the current transform and clears it. Use this method for events that are not part of
|
360
|
+
* a larger gesture (i.e. have no start and end event). For example, this would be used for `onwheel`
|
361
|
+
* events, but not for `onpointer` events.
|
362
|
+
*/
|
363
|
+
applyAndFinalizeTransform(transformUpdate) {
|
364
|
+
this.updateTransform(transformUpdate, true);
|
365
|
+
this.transform = null;
|
366
|
+
}
|
367
|
+
onWheel({ delta, screenPos }) {
|
368
|
+
this.inertialScroller?.stop();
|
369
|
+
// Reset the transformation -- wheel events are individual events, so we don't
|
370
|
+
// need to unapply/reapply.
|
371
|
+
this.transform = Viewport.transformBy(Mat33.identity);
|
372
|
+
const canvasPos = this.editor.viewport.screenToCanvas(screenPos);
|
373
|
+
const toCanvas = this.editor.viewport.screenToCanvasTransform;
|
374
|
+
// Transform without including translation
|
375
|
+
const translation = toCanvas.transformVec3(Vec3.of(-delta.x, -delta.y, 0));
|
376
|
+
let pinchAmount = delta.z;
|
377
|
+
// Clamp the magnitude of pinchAmount
|
378
|
+
pinchAmount = Math.atan(pinchAmount / 2) * 2;
|
379
|
+
const pinchZoomScaleFactor = 1.04;
|
380
|
+
const transformUpdate = Mat33.scaling2D(Math.max(0.4, Math.min(Math.pow(pinchZoomScaleFactor, -pinchAmount), 4)), canvasPos).rightMul(Mat33.translation(translation));
|
381
|
+
this.applyAndFinalizeTransform(transformUpdate);
|
382
|
+
return true;
|
383
|
+
}
|
384
|
+
onKeyPress(event) {
|
385
|
+
this.inertialScroller?.stop();
|
386
|
+
if (!(this.mode & PanZoomMode.Keyboard)) {
|
387
|
+
return false;
|
388
|
+
}
|
389
|
+
// No need to keep the same the transform for keyboard events.
|
390
|
+
this.transform = Viewport.transformBy(Mat33.identity);
|
391
|
+
let translation = Vec2.zero;
|
392
|
+
let scale = 1;
|
393
|
+
let rotation = 0;
|
394
|
+
// Keyboard shortcut handling
|
395
|
+
const shortcucts = this.editor.shortcuts;
|
396
|
+
if (shortcucts.matchesShortcut(moveLeftKeyboardShortcutId, event)) {
|
397
|
+
translation = Vec2.of(-1, 0);
|
398
|
+
}
|
399
|
+
else if (shortcucts.matchesShortcut(moveRightKeyboardShortcutId, event)) {
|
400
|
+
translation = Vec2.of(1, 0);
|
401
|
+
}
|
402
|
+
else if (shortcucts.matchesShortcut(moveUpKeyboardShortcutId, event)) {
|
403
|
+
translation = Vec2.of(0, -1);
|
404
|
+
}
|
405
|
+
else if (shortcucts.matchesShortcut(moveDownKeyboardShortcutId, event)) {
|
406
|
+
translation = Vec2.of(0, 1);
|
407
|
+
}
|
408
|
+
else if (shortcucts.matchesShortcut(zoomInKeyboardShortcutId, event)) {
|
409
|
+
scale = 1 / 2;
|
410
|
+
}
|
411
|
+
else if (shortcucts.matchesShortcut(zoomOutKeyboardShortcutId, event)) {
|
412
|
+
scale = 2;
|
413
|
+
}
|
414
|
+
else if (shortcucts.matchesShortcut(rotateClockwiseKeyboardShortcutId, event)) {
|
415
|
+
rotation = 1;
|
416
|
+
}
|
417
|
+
else if (shortcucts.matchesShortcut(rotateCounterClockwiseKeyboardShortcutId, event)) {
|
418
|
+
rotation = -1;
|
419
|
+
}
|
420
|
+
else {
|
421
|
+
return false;
|
422
|
+
}
|
423
|
+
// For each keypress,
|
424
|
+
translation = translation.times(30); // Move at most 30 units
|
425
|
+
rotation *= Math.PI / 8; // Rotate at least a sixteenth of a rotation
|
426
|
+
// Transform the canvas, not the viewport:
|
427
|
+
translation = translation.times(-1);
|
428
|
+
rotation = rotation * -1;
|
429
|
+
scale = 1 / scale;
|
430
|
+
// Work around an issue that seems to be related to rotation matricies losing precision on inversion.
|
431
|
+
// TODO: Figure out why and implement a better solution.
|
432
|
+
if (rotation !== 0) {
|
433
|
+
rotation += 0.0001;
|
434
|
+
}
|
435
|
+
if (this.isRotationLocked()) {
|
436
|
+
rotation = 0;
|
437
|
+
}
|
438
|
+
const toCanvas = this.editor.viewport.screenToCanvasTransform;
|
439
|
+
// Transform without translating (treat toCanvas as a linear instead of
|
440
|
+
// an affine transformation).
|
441
|
+
translation = toCanvas.transformVec3(translation);
|
442
|
+
// Rotate/scale about the center of the canvas
|
443
|
+
const transformCenter = this.editor.viewport.visibleRect.center;
|
444
|
+
const transformUpdate = Mat33.scaling2D(scale, transformCenter)
|
445
|
+
.rightMul(Mat33.zRotation(rotation, transformCenter))
|
446
|
+
.rightMul(Mat33.translation(translation));
|
447
|
+
this.applyAndFinalizeTransform(transformUpdate);
|
448
|
+
return true;
|
449
|
+
}
|
450
|
+
isRotationLocked() {
|
451
|
+
return !!(this.mode & PanZoomMode.RotationLocked);
|
452
|
+
}
|
453
|
+
/**
|
454
|
+
* Changes the types of gestures used by this pan/zoom tool.
|
455
|
+
*
|
456
|
+
* @see {@link PanZoomMode} {@link setMode}
|
457
|
+
*
|
458
|
+
* @example
|
459
|
+
* ```ts,runnable
|
460
|
+
* import { Editor, PanZoomTool, PanZoomMode } from 'js-draw';
|
461
|
+
*
|
462
|
+
* const editor = new Editor(document.body);
|
463
|
+
*
|
464
|
+
* // By default, there are multiple PanZoom tools that handle different events.
|
465
|
+
* // This gets all PanZoomTools.
|
466
|
+
* const panZoomToolList = editor.toolController.getMatchingTools(PanZoomTool);
|
467
|
+
*
|
468
|
+
* // The first PanZoomTool is the highest priority -- by default,
|
469
|
+
* // this tool is responsible for handling multi-finger touch gestures.
|
470
|
+
* //
|
471
|
+
* // Lower-priority PanZoomTools handle one-finger touch gestures and
|
472
|
+
* // key-presses.
|
473
|
+
* const panZoomTool = panZoomToolList[0];
|
474
|
+
*
|
475
|
+
* // Lock rotation for multi-finger touch gestures.
|
476
|
+
* panZoomTool.setModeEnabled(PanZoomMode.RotationLocked, true);
|
477
|
+
* ```
|
478
|
+
*/
|
479
|
+
setModeEnabled(mode, enabled) {
|
480
|
+
let newMode = this.mode;
|
481
|
+
if (enabled) {
|
482
|
+
newMode |= mode;
|
483
|
+
}
|
484
|
+
else {
|
485
|
+
newMode &= ~mode;
|
486
|
+
}
|
487
|
+
this.setMode(newMode);
|
488
|
+
}
|
489
|
+
/**
|
490
|
+
* Sets all modes for this tool using a bitmask.
|
491
|
+
*
|
492
|
+
* @see {@link setModeEnabled}
|
493
|
+
*
|
494
|
+
* @example
|
495
|
+
* ```ts
|
496
|
+
* tool.setMode(PanZoomMode.RotationLocked|PanZoomMode.TwoFingerTouchGestures);
|
497
|
+
* ```
|
498
|
+
*/
|
499
|
+
setMode(mode) {
|
500
|
+
if (mode !== this.mode) {
|
501
|
+
this.mode = mode;
|
502
|
+
this.editor.notifier.dispatch(EditorEventType.ToolUpdated, {
|
503
|
+
kind: EditorEventType.ToolUpdated,
|
504
|
+
tool: this,
|
505
|
+
});
|
506
|
+
}
|
507
|
+
}
|
508
|
+
/**
|
509
|
+
* Returns a bitmask indicating the currently-enabled modes.
|
510
|
+
* @see {@link setModeEnabled}
|
511
|
+
*/
|
512
|
+
getMode() {
|
513
|
+
return this.mode;
|
514
|
+
}
|
515
|
+
}
|
@@ -0,0 +1 @@
|
|
1
|
+
export {};
|
@@ -0,0 +1,23 @@
|
|
1
|
+
import Editor from '../Editor';
|
2
|
+
import { PasteEvent } from '../inputEvents';
|
3
|
+
import BaseTool from './BaseTool';
|
4
|
+
/**
|
5
|
+
* A tool that handles paste events (e.g. as triggered by ctrl+V).
|
6
|
+
*
|
7
|
+
* @example
|
8
|
+
* While `ToolController` has a `PasteHandler` in its default list of tools,
|
9
|
+
* if a non-default set is being used, `PasteHandler` can be added as follows:
|
10
|
+
* ```ts
|
11
|
+
* const toolController = editor.toolController;
|
12
|
+
* toolController.addTool(new PasteHandler(editor));
|
13
|
+
* ```
|
14
|
+
*/
|
15
|
+
export default class PasteHandler extends BaseTool {
|
16
|
+
private editor;
|
17
|
+
constructor(editor: Editor);
|
18
|
+
onPaste(event: PasteEvent): boolean;
|
19
|
+
private addComponentsFromPaste;
|
20
|
+
private doSVGPaste;
|
21
|
+
private doTextPaste;
|
22
|
+
private doImagePaste;
|
23
|
+
}
|