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,287 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
const TextComponent_1 = __importDefault(require("../components/TextComponent"));
|
7
|
+
const EditorImage_1 = __importDefault(require("../image/EditorImage"));
|
8
|
+
const math_1 = require("@js-draw/math");
|
9
|
+
const Pointer_1 = require("../Pointer");
|
10
|
+
const types_1 = require("../types");
|
11
|
+
const BaseTool_1 = __importDefault(require("./BaseTool"));
|
12
|
+
const Erase_1 = __importDefault(require("../commands/Erase"));
|
13
|
+
const uniteCommands_1 = __importDefault(require("../commands/uniteCommands"));
|
14
|
+
const ReactiveValue_1 = require("../util/ReactiveValue");
|
15
|
+
const overlayCSSClass = 'textEditorOverlay';
|
16
|
+
class TextTool extends BaseTool_1.default {
|
17
|
+
constructor(editor, description, localizationTable) {
|
18
|
+
super(editor.notifier, description);
|
19
|
+
this.editor = editor;
|
20
|
+
this.localizationTable = localizationTable;
|
21
|
+
this.textInputElem = null;
|
22
|
+
this.textTargetPosition = null;
|
23
|
+
this.textMeasuringCtx = null;
|
24
|
+
this.textScale = math_1.Vec2.of(1, 1);
|
25
|
+
this.removeExistingCommand = null;
|
26
|
+
const editorFonts = editor.getCurrentSettings().text?.fonts ?? [];
|
27
|
+
this.textStyleValue = ReactiveValue_1.ReactiveValue.fromInitialValue({
|
28
|
+
size: 32,
|
29
|
+
fontFamily: editorFonts.length > 0 ? editorFonts[0] : 'sans-serif',
|
30
|
+
renderingStyle: {
|
31
|
+
fill: math_1.Color4.purple,
|
32
|
+
},
|
33
|
+
});
|
34
|
+
this.textStyleValue.onUpdateAndNow(() => {
|
35
|
+
this.textStyle = this.textStyleValue.get();
|
36
|
+
this.updateTextInput();
|
37
|
+
this.editor.notifier.dispatch(types_1.EditorEventType.ToolUpdated, {
|
38
|
+
kind: types_1.EditorEventType.ToolUpdated,
|
39
|
+
tool: this,
|
40
|
+
});
|
41
|
+
});
|
42
|
+
this.textEditOverlay = document.createElement('div');
|
43
|
+
this.textEditOverlay.classList.add(overlayCSSClass);
|
44
|
+
this.editor.addStyleSheet(`
|
45
|
+
.${overlayCSSClass} {
|
46
|
+
height: 0;
|
47
|
+
overflow: visible;
|
48
|
+
|
49
|
+
/* Allows absolutely-positioned textareas to scroll with
|
50
|
+
the containing overlay. */
|
51
|
+
position: relative;
|
52
|
+
}
|
53
|
+
|
54
|
+
.${overlayCSSClass} textarea {
|
55
|
+
background-color: rgba(0, 0, 0, 0);
|
56
|
+
|
57
|
+
white-space: pre;
|
58
|
+
overflow: hidden;
|
59
|
+
|
60
|
+
padding: 0;
|
61
|
+
margin: 0;
|
62
|
+
border: none;
|
63
|
+
padding: 0;
|
64
|
+
|
65
|
+
min-width: 100px;
|
66
|
+
min-height: 1.1em;
|
67
|
+
}
|
68
|
+
`);
|
69
|
+
this.editor.createHTMLOverlay(this.textEditOverlay);
|
70
|
+
this.editor.notifier.on(types_1.EditorEventType.ViewportChanged, () => this.updateTextInput());
|
71
|
+
}
|
72
|
+
initTextMeasuringCanvas() {
|
73
|
+
this.textMeasuringCtx ??= document.createElement('canvas').getContext('2d');
|
74
|
+
}
|
75
|
+
getTextAscent(text, style) {
|
76
|
+
this.initTextMeasuringCanvas();
|
77
|
+
if (this.textMeasuringCtx) {
|
78
|
+
this.textMeasuringCtx.textBaseline = 'alphabetic';
|
79
|
+
TextComponent_1.default.applyTextStyles(this.textMeasuringCtx, style);
|
80
|
+
const measurement = this.textMeasuringCtx.measureText(text);
|
81
|
+
return measurement.fontBoundingBoxAscent ?? measurement.actualBoundingBoxAscent;
|
82
|
+
}
|
83
|
+
// Estimate
|
84
|
+
return (style.size * 2) / 3;
|
85
|
+
}
|
86
|
+
// Take input from this' textInputElem and add it to the EditorImage.
|
87
|
+
// If [removeInput], the HTML input element is removed. Otherwise, its value
|
88
|
+
// is cleared.
|
89
|
+
flushInput(removeInput = true) {
|
90
|
+
if (this.textInputElem && this.textTargetPosition) {
|
91
|
+
const content = this.textInputElem.value.trimEnd();
|
92
|
+
this.textInputElem.value = '';
|
93
|
+
if (removeInput) {
|
94
|
+
// In some browsers, .remove() triggers a .blur event (synchronously).
|
95
|
+
// Clear this.textInputElem before removal
|
96
|
+
const input = this.textInputElem;
|
97
|
+
this.textInputElem = null;
|
98
|
+
input.remove();
|
99
|
+
}
|
100
|
+
if (content === '') {
|
101
|
+
return;
|
102
|
+
}
|
103
|
+
const textTransform = math_1.Mat33.translation(this.textTargetPosition)
|
104
|
+
.rightMul(this.getTextScaleMatrix())
|
105
|
+
.rightMul(math_1.Mat33.scaling2D(this.editor.viewport.getSizeOfPixelOnCanvas()))
|
106
|
+
.rightMul(math_1.Mat33.zRotation(this.textRotation));
|
107
|
+
const textComponent = TextComponent_1.default.fromLines(content.split('\n'), textTransform, this.textStyle);
|
108
|
+
const action = EditorImage_1.default.addElement(textComponent);
|
109
|
+
if (this.removeExistingCommand) {
|
110
|
+
// Unapply so that `removeExistingCommand` can be added to the undo stack.
|
111
|
+
this.removeExistingCommand.unapply(this.editor);
|
112
|
+
this.editor.dispatch((0, uniteCommands_1.default)([this.removeExistingCommand, action]));
|
113
|
+
this.removeExistingCommand = null;
|
114
|
+
}
|
115
|
+
else {
|
116
|
+
this.editor.dispatch(action);
|
117
|
+
}
|
118
|
+
}
|
119
|
+
}
|
120
|
+
getTextScaleMatrix() {
|
121
|
+
return math_1.Mat33.scaling2D(this.textScale.times(1 / this.editor.viewport.getSizeOfPixelOnCanvas()));
|
122
|
+
}
|
123
|
+
updateTextInput() {
|
124
|
+
if (!this.textInputElem || !this.textTargetPosition) {
|
125
|
+
this.textInputElem?.remove();
|
126
|
+
return;
|
127
|
+
}
|
128
|
+
const viewport = this.editor.viewport;
|
129
|
+
const textScreenPos = viewport.canvasToScreen(this.textTargetPosition);
|
130
|
+
this.textInputElem.placeholder = this.localizationTable.enterTextToInsert;
|
131
|
+
this.textInputElem.style.fontFamily = this.textStyle.fontFamily;
|
132
|
+
this.textInputElem.style.fontStyle = this.textStyle.fontStyle ?? '';
|
133
|
+
this.textInputElem.style.fontVariant = this.textStyle.fontVariant ?? '';
|
134
|
+
this.textInputElem.style.fontWeight = this.textStyle.fontWeight ?? '';
|
135
|
+
this.textInputElem.style.fontSize = `${this.textStyle.size}px`;
|
136
|
+
this.textInputElem.style.color = this.textStyle.renderingStyle.fill.toHexString();
|
137
|
+
this.textInputElem.style.position = 'absolute';
|
138
|
+
this.textInputElem.style.left = `${textScreenPos.x}px`;
|
139
|
+
this.textInputElem.style.top = `${textScreenPos.y}px`;
|
140
|
+
this.textInputElem.style.margin = '0';
|
141
|
+
this.textInputElem.style.width = `${this.textInputElem.scrollWidth}px`;
|
142
|
+
this.textInputElem.style.height = `${this.textInputElem.scrollHeight}px`;
|
143
|
+
// Get the ascent based on the font, using a string of characters
|
144
|
+
// that is tall in most fonts.
|
145
|
+
const tallText = 'Testing!';
|
146
|
+
const ascent = this.getTextAscent(tallText, this.textStyle);
|
147
|
+
const vertAdjust = ascent;
|
148
|
+
const rotation = this.textRotation + viewport.getRotationAngle();
|
149
|
+
const scale = this.getTextScaleMatrix();
|
150
|
+
this.textInputElem.style.transform = `${scale.toCSSMatrix()} rotate(${(rotation * 180) / Math.PI}deg) translate(0, ${-vertAdjust}px)`;
|
151
|
+
this.textInputElem.style.transformOrigin = 'top left';
|
152
|
+
// Match the line height of default rendered text.
|
153
|
+
const lineHeight = Math.floor(this.textStyle.size);
|
154
|
+
this.textInputElem.style.lineHeight = `${lineHeight}px`;
|
155
|
+
}
|
156
|
+
startTextInput(textCanvasPos, initialText) {
|
157
|
+
this.flushInput();
|
158
|
+
this.textInputElem = document.createElement('textarea');
|
159
|
+
this.textInputElem.value = initialText;
|
160
|
+
this.textInputElem.style.display = 'inline-block';
|
161
|
+
this.textTargetPosition = this.editor.viewport.roundPoint(textCanvasPos);
|
162
|
+
this.textRotation = -this.editor.viewport.getRotationAngle();
|
163
|
+
this.textScale = math_1.Vec2.of(1, 1).times(this.editor.viewport.getSizeOfPixelOnCanvas());
|
164
|
+
this.updateTextInput();
|
165
|
+
// Update the input size/position/etc. after the placeHolder has had time to appear.
|
166
|
+
setTimeout(() => this.updateTextInput(), 0);
|
167
|
+
this.textInputElem.oninput = () => {
|
168
|
+
if (this.textInputElem) {
|
169
|
+
this.textInputElem.style.width = `${this.textInputElem.scrollWidth}px`;
|
170
|
+
this.textInputElem.style.height = `${this.textInputElem.scrollHeight}px`;
|
171
|
+
}
|
172
|
+
};
|
173
|
+
this.textInputElem.onblur = () => {
|
174
|
+
// Delay removing the input -- flushInput may be called within a blur()
|
175
|
+
// event handler
|
176
|
+
const removeInput = false;
|
177
|
+
const input = this.textInputElem;
|
178
|
+
this.flushInput(removeInput);
|
179
|
+
this.textInputElem = null;
|
180
|
+
setTimeout(() => {
|
181
|
+
input?.remove();
|
182
|
+
}, 0);
|
183
|
+
};
|
184
|
+
this.textInputElem.onkeyup = (evt) => {
|
185
|
+
if (evt.key === 'Enter' && !evt.shiftKey) {
|
186
|
+
this.flushInput();
|
187
|
+
this.editor.focus();
|
188
|
+
}
|
189
|
+
else if (evt.key === 'Escape') {
|
190
|
+
// Cancel input.
|
191
|
+
this.textInputElem?.remove();
|
192
|
+
this.textInputElem = null;
|
193
|
+
this.editor.focus();
|
194
|
+
this.removeExistingCommand?.unapply(this.editor);
|
195
|
+
this.removeExistingCommand = null;
|
196
|
+
}
|
197
|
+
};
|
198
|
+
this.textEditOverlay.replaceChildren(this.textInputElem);
|
199
|
+
setTimeout(() => this.textInputElem?.focus(), 0);
|
200
|
+
}
|
201
|
+
setEnabled(enabled) {
|
202
|
+
super.setEnabled(enabled);
|
203
|
+
if (!this.isEnabled()) {
|
204
|
+
this.flushInput();
|
205
|
+
}
|
206
|
+
this.textEditOverlay.style.display = enabled ? 'block' : 'none';
|
207
|
+
}
|
208
|
+
onPointerDown({ current, allPointers }) {
|
209
|
+
if (current.device === Pointer_1.PointerDevice.Eraser) {
|
210
|
+
return false;
|
211
|
+
}
|
212
|
+
if (allPointers.length === 1) {
|
213
|
+
// Are we clicking on a text node?
|
214
|
+
const canvasPos = current.canvasPos;
|
215
|
+
const halfTestRegionSize = math_1.Vec2.of(2.5, 2.5).times(this.editor.viewport.getSizeOfPixelOnCanvas());
|
216
|
+
const testRegion = math_1.Rect2.fromCorners(canvasPos.minus(halfTestRegionSize), canvasPos.plus(halfTestRegionSize));
|
217
|
+
const targetNodes = this.editor.image.getElementsIntersectingRegion(testRegion);
|
218
|
+
let targetTextNodes = targetNodes.filter((node) => node instanceof TextComponent_1.default);
|
219
|
+
// Don't try to edit text nodes that contain the viewport (this allows us
|
220
|
+
// to zoom in on text nodes and add text on top of them.)
|
221
|
+
const visibleRect = this.editor.viewport.visibleRect;
|
222
|
+
targetTextNodes = targetTextNodes.filter((node) => !node.getBBox().containsRect(visibleRect));
|
223
|
+
// End any TextNodes we're currently editing.
|
224
|
+
this.flushInput();
|
225
|
+
if (targetTextNodes.length > 0) {
|
226
|
+
const targetNode = targetTextNodes[targetTextNodes.length - 1];
|
227
|
+
this.setTextStyle(targetNode.getTextStyle());
|
228
|
+
// Create and temporarily apply removeExistingCommand.
|
229
|
+
this.removeExistingCommand = new Erase_1.default([targetNode]);
|
230
|
+
this.removeExistingCommand.apply(this.editor);
|
231
|
+
this.startTextInput(targetNode.getBaselinePos(), targetNode.getText());
|
232
|
+
const transform = targetNode.getTransform();
|
233
|
+
this.textRotation = transform.transformVec3(math_1.Vec2.unitX).angle();
|
234
|
+
const scaleFactor = transform.transformVec3(math_1.Vec2.unitX).magnitude();
|
235
|
+
this.textScale = math_1.Vec2.of(1, 1).times(scaleFactor);
|
236
|
+
this.updateTextInput();
|
237
|
+
}
|
238
|
+
else {
|
239
|
+
this.removeExistingCommand = null;
|
240
|
+
this.startTextInput(current.canvasPos, '');
|
241
|
+
}
|
242
|
+
return true;
|
243
|
+
}
|
244
|
+
return false;
|
245
|
+
}
|
246
|
+
onGestureCancel() {
|
247
|
+
this.flushInput();
|
248
|
+
this.editor.focus();
|
249
|
+
}
|
250
|
+
setFontFamily(fontFamily) {
|
251
|
+
if (fontFamily !== this.textStyle.fontFamily) {
|
252
|
+
this.textStyleValue.set({
|
253
|
+
...this.textStyle,
|
254
|
+
fontFamily: fontFamily,
|
255
|
+
});
|
256
|
+
}
|
257
|
+
}
|
258
|
+
setColor(color) {
|
259
|
+
if (!color.eq(this.textStyle.renderingStyle.fill)) {
|
260
|
+
this.textStyleValue.set({
|
261
|
+
...this.textStyle,
|
262
|
+
renderingStyle: {
|
263
|
+
...this.textStyle.renderingStyle,
|
264
|
+
fill: color,
|
265
|
+
},
|
266
|
+
});
|
267
|
+
}
|
268
|
+
}
|
269
|
+
setFontSize(size) {
|
270
|
+
if (size !== this.textStyle.size) {
|
271
|
+
this.textStyleValue.set({
|
272
|
+
...this.textStyle,
|
273
|
+
size,
|
274
|
+
});
|
275
|
+
}
|
276
|
+
}
|
277
|
+
getTextStyle() {
|
278
|
+
return this.textStyle;
|
279
|
+
}
|
280
|
+
getStyleValue() {
|
281
|
+
return this.textStyleValue;
|
282
|
+
}
|
283
|
+
setTextStyle(style) {
|
284
|
+
this.textStyleValue.set(style);
|
285
|
+
}
|
286
|
+
}
|
287
|
+
exports.default = TextTool;
|
@@ -0,0 +1 @@
|
|
1
|
+
export {};
|
@@ -0,0 +1,73 @@
|
|
1
|
+
import Editor from '../Editor';
|
2
|
+
import BaseTool from './BaseTool';
|
3
|
+
import ToolEnabledGroup from './ToolEnabledGroup';
|
4
|
+
import { ToolLocalization } from './localization';
|
5
|
+
import InputMapper, { InputEventListener } from './InputFilter/InputMapper';
|
6
|
+
import { InputEvt } from '../inputEvents';
|
7
|
+
export default class ToolController implements InputEventListener {
|
8
|
+
private tools;
|
9
|
+
private activeTool;
|
10
|
+
private primaryToolGroup;
|
11
|
+
private inputPipeline;
|
12
|
+
private isEditorReadOnly;
|
13
|
+
/** @internal */
|
14
|
+
constructor(editor: Editor, localization: ToolLocalization);
|
15
|
+
/**
|
16
|
+
* Replaces the current set of tools with `tools`. This should only be done before
|
17
|
+
* the creation of the app's toolbar (if using `AbstractToolbar`).
|
18
|
+
*
|
19
|
+
* If no `primaryToolGroup` is given, an empty one will be created.
|
20
|
+
*/
|
21
|
+
setTools(tools: BaseTool[], primaryToolGroup?: ToolEnabledGroup): void;
|
22
|
+
/**
|
23
|
+
* Add a tool that acts like one of the primary tools (only one primary tool can be enabled at a time).
|
24
|
+
*
|
25
|
+
* If the tool is already added to this, the tool is converted to a primary tool.
|
26
|
+
*
|
27
|
+
* This should be called before creating the app's toolbar.
|
28
|
+
*/
|
29
|
+
addPrimaryTool(tool: BaseTool): void;
|
30
|
+
getPrimaryTools(): BaseTool[];
|
31
|
+
/**
|
32
|
+
* Add a tool to the end of this' tool list (the added tool receives events after tools already added to this).
|
33
|
+
* This should be called before creating the app's toolbar.
|
34
|
+
*
|
35
|
+
* If `options.addToFront`, the tool is added to the beginning of this' tool list.
|
36
|
+
*
|
37
|
+
* Does nothing if the tool is already present.
|
38
|
+
*/
|
39
|
+
addTool(tool: BaseTool, options?: {
|
40
|
+
addToFront: boolean;
|
41
|
+
}): void;
|
42
|
+
/**
|
43
|
+
* Removes **and destroys** all tools in `tools` from this.
|
44
|
+
*/
|
45
|
+
removeAndDestroyTools(tools: BaseTool[]): void;
|
46
|
+
private insertTools;
|
47
|
+
/**
|
48
|
+
* Removes a tool from this' tool list and replaces it with `replaceWith`.
|
49
|
+
*
|
50
|
+
* If any of `toolsToInsert` have already been added to this, the tools are
|
51
|
+
* moved.
|
52
|
+
*
|
53
|
+
* This should be called before creating the editor's toolbar.
|
54
|
+
*/
|
55
|
+
insertToolsAfter(insertAfter: BaseTool, toolsToInsert: BaseTool[]): void;
|
56
|
+
/** @see {@link insertToolsAfter} */
|
57
|
+
insertToolsBefore(insertBefore: BaseTool, toolsToInsert: BaseTool[]): void;
|
58
|
+
private onEventInternal;
|
59
|
+
/** Alias for {@link dispatchInputEvent}. */
|
60
|
+
onEvent(event: InputEvt): boolean;
|
61
|
+
dispatchInputEvent(event: InputEvt): boolean;
|
62
|
+
/**
|
63
|
+
* Adds a new `InputMapper` to this' input pipeline.
|
64
|
+
*
|
65
|
+
* A `mapper` is really a relation that maps each event to no, one,
|
66
|
+
* or many other events.
|
67
|
+
*
|
68
|
+
* @see {@link InputMapper}.
|
69
|
+
*/
|
70
|
+
addInputMapper(mapper: InputMapper): void;
|
71
|
+
getMatchingTools<Type extends BaseTool>(type: new (...args: any[]) => Type): Type[];
|
72
|
+
onEditorDestroyed(): void;
|
73
|
+
}
|
@@ -0,0 +1,310 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
27
|
+
};
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
29
|
+
const types_1 = require("../types");
|
30
|
+
const math_1 = require("@js-draw/math");
|
31
|
+
const PanZoom_1 = __importStar(require("./PanZoom"));
|
32
|
+
const Pen_1 = __importDefault(require("./Pen"));
|
33
|
+
const ToolEnabledGroup_1 = __importDefault(require("./ToolEnabledGroup"));
|
34
|
+
const Eraser_1 = __importDefault(require("./Eraser"));
|
35
|
+
const SelectionTool_1 = __importDefault(require("./SelectionTool/SelectionTool"));
|
36
|
+
const UndoRedoShortcut_1 = __importDefault(require("./UndoRedoShortcut"));
|
37
|
+
const TextTool_1 = __importDefault(require("./TextTool"));
|
38
|
+
const PipetteTool_1 = __importDefault(require("./PipetteTool"));
|
39
|
+
const ToolSwitcherShortcut_1 = __importDefault(require("./ToolSwitcherShortcut"));
|
40
|
+
const PasteHandler_1 = __importDefault(require("./PasteHandler"));
|
41
|
+
const ToolbarShortcutHandler_1 = __importDefault(require("./ToolbarShortcutHandler"));
|
42
|
+
const PressureSensitiveFreehandLineBuilder_1 = require("../components/builders/PressureSensitiveFreehandLineBuilder");
|
43
|
+
const FindTool_1 = __importDefault(require("./FindTool"));
|
44
|
+
const SelectAllShortcutHandler_1 = __importDefault(require("./SelectionTool/SelectAllShortcutHandler"));
|
45
|
+
const SoundUITool_1 = __importDefault(require("./SoundUITool"));
|
46
|
+
const inputEvents_1 = require("../inputEvents");
|
47
|
+
const InputPipeline_1 = __importDefault(require("./InputFilter/InputPipeline"));
|
48
|
+
const InputStabilizer_1 = __importDefault(require("./InputFilter/InputStabilizer"));
|
49
|
+
const ScrollbarTool_1 = __importDefault(require("./ScrollbarTool"));
|
50
|
+
class ToolController {
|
51
|
+
/** @internal */
|
52
|
+
constructor(editor, localization) {
|
53
|
+
this.activeTool = null;
|
54
|
+
this.isEditorReadOnly = editor.isReadOnlyReactiveValue();
|
55
|
+
this.inputPipeline = new InputPipeline_1.default();
|
56
|
+
this.inputPipeline.setEmitListener((event) => this.onEventInternal(event));
|
57
|
+
const primaryToolGroup = new ToolEnabledGroup_1.default();
|
58
|
+
this.primaryToolGroup = primaryToolGroup;
|
59
|
+
const panZoomTool = new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.TwoFingerTouchGestures | PanZoom_1.PanZoomMode.RightClickDrags, localization.touchPanTool);
|
60
|
+
const keyboardPanZoomTool = new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.Keyboard, localization.keyboardPanZoom);
|
61
|
+
const primaryPenTool = new Pen_1.default(editor, localization.penTool(1), {
|
62
|
+
color: math_1.Color4.purple,
|
63
|
+
thickness: 8,
|
64
|
+
});
|
65
|
+
const secondaryPenTool = new Pen_1.default(editor, localization.penTool(2), {
|
66
|
+
color: math_1.Color4.clay,
|
67
|
+
thickness: 4,
|
68
|
+
});
|
69
|
+
// Stabilize the secondary pen tool.
|
70
|
+
secondaryPenTool.setInputMapper(new InputStabilizer_1.default(editor.viewport));
|
71
|
+
const eraser = new Eraser_1.default(editor, localization.eraserTool);
|
72
|
+
const primaryTools = [
|
73
|
+
// Three pens
|
74
|
+
primaryPenTool,
|
75
|
+
secondaryPenTool,
|
76
|
+
// Highlighter-like pen with width=40
|
77
|
+
new Pen_1.default(editor, localization.penTool(3), {
|
78
|
+
color: math_1.Color4.ofRGBA(1, 1, 0, 0.5),
|
79
|
+
thickness: 40,
|
80
|
+
factory: PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder,
|
81
|
+
}),
|
82
|
+
eraser,
|
83
|
+
new SelectionTool_1.default(editor, localization.selectionTool),
|
84
|
+
new TextTool_1.default(editor, localization.textTool, localization),
|
85
|
+
new PanZoom_1.default(editor, PanZoom_1.PanZoomMode.SinglePointerGestures, localization.anyDevicePanning),
|
86
|
+
];
|
87
|
+
// Accessibility tools
|
88
|
+
const soundExplorer = new SoundUITool_1.default(editor, localization.soundExplorer);
|
89
|
+
soundExplorer.setEnabled(false);
|
90
|
+
this.tools = [
|
91
|
+
new ScrollbarTool_1.default(editor),
|
92
|
+
new PipetteTool_1.default(editor, localization.pipetteTool),
|
93
|
+
soundExplorer,
|
94
|
+
panZoomTool,
|
95
|
+
...primaryTools,
|
96
|
+
keyboardPanZoomTool,
|
97
|
+
new UndoRedoShortcut_1.default(editor),
|
98
|
+
new ToolbarShortcutHandler_1.default(editor),
|
99
|
+
new ToolSwitcherShortcut_1.default(editor),
|
100
|
+
eraser.makeEraserSwitcherTool(),
|
101
|
+
new FindTool_1.default(editor),
|
102
|
+
new PasteHandler_1.default(editor),
|
103
|
+
new SelectAllShortcutHandler_1.default(editor),
|
104
|
+
];
|
105
|
+
primaryTools.forEach((tool) => tool.setToolGroup(primaryToolGroup));
|
106
|
+
panZoomTool.setEnabled(true);
|
107
|
+
primaryPenTool.setEnabled(true);
|
108
|
+
editor.notifier.on(types_1.EditorEventType.ToolEnabled, (event) => {
|
109
|
+
if (event.kind === types_1.EditorEventType.ToolEnabled) {
|
110
|
+
editor.announceForAccessibility(localization.toolEnabledAnnouncement(event.tool.description));
|
111
|
+
}
|
112
|
+
});
|
113
|
+
editor.notifier.on(types_1.EditorEventType.ToolDisabled, (event) => {
|
114
|
+
if (event.kind === types_1.EditorEventType.ToolDisabled) {
|
115
|
+
editor.announceForAccessibility(localization.toolDisabledAnnouncement(event.tool.description));
|
116
|
+
}
|
117
|
+
});
|
118
|
+
this.activeTool = null;
|
119
|
+
}
|
120
|
+
/**
|
121
|
+
* Replaces the current set of tools with `tools`. This should only be done before
|
122
|
+
* the creation of the app's toolbar (if using `AbstractToolbar`).
|
123
|
+
*
|
124
|
+
* If no `primaryToolGroup` is given, an empty one will be created.
|
125
|
+
*/
|
126
|
+
setTools(tools, primaryToolGroup) {
|
127
|
+
this.tools = tools;
|
128
|
+
this.primaryToolGroup = primaryToolGroup ?? new ToolEnabledGroup_1.default();
|
129
|
+
}
|
130
|
+
/**
|
131
|
+
* Add a tool that acts like one of the primary tools (only one primary tool can be enabled at a time).
|
132
|
+
*
|
133
|
+
* If the tool is already added to this, the tool is converted to a primary tool.
|
134
|
+
*
|
135
|
+
* This should be called before creating the app's toolbar.
|
136
|
+
*/
|
137
|
+
addPrimaryTool(tool) {
|
138
|
+
tool.setToolGroup(this.primaryToolGroup);
|
139
|
+
if (tool.isEnabled()) {
|
140
|
+
this.primaryToolGroup.notifyEnabled(tool);
|
141
|
+
}
|
142
|
+
if (!this.tools.includes(tool)) {
|
143
|
+
this.addTool(tool);
|
144
|
+
}
|
145
|
+
}
|
146
|
+
getPrimaryTools() {
|
147
|
+
return this.tools.filter((tool) => {
|
148
|
+
return tool.getToolGroup() === this.primaryToolGroup;
|
149
|
+
});
|
150
|
+
}
|
151
|
+
/**
|
152
|
+
* Add a tool to the end of this' tool list (the added tool receives events after tools already added to this).
|
153
|
+
* This should be called before creating the app's toolbar.
|
154
|
+
*
|
155
|
+
* If `options.addToFront`, the tool is added to the beginning of this' tool list.
|
156
|
+
*
|
157
|
+
* Does nothing if the tool is already present.
|
158
|
+
*/
|
159
|
+
addTool(tool, options) {
|
160
|
+
// Only add if not already present.
|
161
|
+
if (!this.tools.includes(tool)) {
|
162
|
+
if (options?.addToFront) {
|
163
|
+
this.tools.splice(0, 0, tool);
|
164
|
+
}
|
165
|
+
else {
|
166
|
+
this.tools.push(tool);
|
167
|
+
}
|
168
|
+
}
|
169
|
+
}
|
170
|
+
/**
|
171
|
+
* Removes **and destroys** all tools in `tools` from this.
|
172
|
+
*/
|
173
|
+
removeAndDestroyTools(tools) {
|
174
|
+
const newTools = [];
|
175
|
+
for (const tool of this.tools) {
|
176
|
+
if (tools.includes(tool)) {
|
177
|
+
if (this.activeTool === tool) {
|
178
|
+
this.activeTool = null;
|
179
|
+
}
|
180
|
+
tool.onDestroy();
|
181
|
+
}
|
182
|
+
else {
|
183
|
+
newTools.push(tool);
|
184
|
+
}
|
185
|
+
}
|
186
|
+
this.tools = newTools;
|
187
|
+
}
|
188
|
+
insertTools(insertNear, toolsToInsert, mode) {
|
189
|
+
this.tools = this.tools.filter((tool) => !toolsToInsert.includes(tool));
|
190
|
+
const newTools = [];
|
191
|
+
for (const tool of this.tools) {
|
192
|
+
if (mode === 'after') {
|
193
|
+
newTools.push(tool);
|
194
|
+
}
|
195
|
+
if (tool === insertNear) {
|
196
|
+
newTools.push(...toolsToInsert);
|
197
|
+
}
|
198
|
+
if (mode === 'before') {
|
199
|
+
newTools.push(tool);
|
200
|
+
}
|
201
|
+
}
|
202
|
+
this.tools = newTools;
|
203
|
+
}
|
204
|
+
/**
|
205
|
+
* Removes a tool from this' tool list and replaces it with `replaceWith`.
|
206
|
+
*
|
207
|
+
* If any of `toolsToInsert` have already been added to this, the tools are
|
208
|
+
* moved.
|
209
|
+
*
|
210
|
+
* This should be called before creating the editor's toolbar.
|
211
|
+
*/
|
212
|
+
insertToolsAfter(insertAfter, toolsToInsert) {
|
213
|
+
this.insertTools(insertAfter, toolsToInsert, 'after');
|
214
|
+
}
|
215
|
+
/** @see {@link insertToolsAfter} */
|
216
|
+
insertToolsBefore(insertBefore, toolsToInsert) {
|
217
|
+
this.insertTools(insertBefore, toolsToInsert, 'before');
|
218
|
+
}
|
219
|
+
// @internal use `dispatchEvent` rather than calling `onEvent` directly.
|
220
|
+
onEventInternal(event) {
|
221
|
+
const isEditorReadOnly = this.isEditorReadOnly.get();
|
222
|
+
const canToolReceiveInput = (tool) => {
|
223
|
+
return tool.isEnabled() && (!isEditorReadOnly || tool.canReceiveInputInReadOnlyEditor());
|
224
|
+
};
|
225
|
+
let handled = false;
|
226
|
+
if (event.kind === inputEvents_1.InputEvtType.PointerDownEvt) {
|
227
|
+
let canOnlySendToActiveTool = false;
|
228
|
+
if (this.activeTool && !this.activeTool.eventCanBeDeliveredToNonActiveTool(event)) {
|
229
|
+
canOnlySendToActiveTool = true;
|
230
|
+
}
|
231
|
+
for (const tool of this.tools) {
|
232
|
+
if (canOnlySendToActiveTool && tool !== this.activeTool) {
|
233
|
+
continue;
|
234
|
+
}
|
235
|
+
if (canToolReceiveInput(tool) && tool.onEvent(event)) {
|
236
|
+
if (this.activeTool !== tool) {
|
237
|
+
this.activeTool?.onEvent({ kind: inputEvents_1.InputEvtType.GestureCancelEvt });
|
238
|
+
}
|
239
|
+
this.activeTool = tool;
|
240
|
+
handled = true;
|
241
|
+
break;
|
242
|
+
}
|
243
|
+
}
|
244
|
+
}
|
245
|
+
else if (event.kind === inputEvents_1.InputEvtType.PointerUpEvt) {
|
246
|
+
const upResult = this.activeTool?.onEvent(event);
|
247
|
+
const continueHandlingEvents = upResult && event.allPointers.length > 1;
|
248
|
+
// Should the active tool continue handling events (without an additional pointer down?)
|
249
|
+
if (!continueHandlingEvents) {
|
250
|
+
// No -- Remove the current tool
|
251
|
+
this.activeTool = null;
|
252
|
+
}
|
253
|
+
handled = true;
|
254
|
+
}
|
255
|
+
else if (event.kind === inputEvents_1.InputEvtType.PointerMoveEvt) {
|
256
|
+
if (this.activeTool !== null) {
|
257
|
+
this.activeTool.onEvent(event);
|
258
|
+
handled = true;
|
259
|
+
}
|
260
|
+
}
|
261
|
+
else if (event.kind === inputEvents_1.InputEvtType.GestureCancelEvt) {
|
262
|
+
if (this.activeTool !== null) {
|
263
|
+
this.activeTool.onEvent(event);
|
264
|
+
this.activeTool = null;
|
265
|
+
}
|
266
|
+
}
|
267
|
+
else {
|
268
|
+
for (const tool of this.tools) {
|
269
|
+
if (!canToolReceiveInput(tool)) {
|
270
|
+
continue;
|
271
|
+
}
|
272
|
+
handled = tool.onEvent(event);
|
273
|
+
if (handled) {
|
274
|
+
break;
|
275
|
+
}
|
276
|
+
}
|
277
|
+
}
|
278
|
+
return handled;
|
279
|
+
}
|
280
|
+
/** Alias for {@link dispatchInputEvent}. */
|
281
|
+
onEvent(event) {
|
282
|
+
return this.dispatchInputEvent(event);
|
283
|
+
}
|
284
|
+
// Returns true if the event was handled.
|
285
|
+
dispatchInputEvent(event) {
|
286
|
+
// Feed the event through the input pipeline
|
287
|
+
return this.inputPipeline.onEvent(event);
|
288
|
+
}
|
289
|
+
/**
|
290
|
+
* Adds a new `InputMapper` to this' input pipeline.
|
291
|
+
*
|
292
|
+
* A `mapper` is really a relation that maps each event to no, one,
|
293
|
+
* or many other events.
|
294
|
+
*
|
295
|
+
* @see {@link InputMapper}.
|
296
|
+
*/
|
297
|
+
addInputMapper(mapper) {
|
298
|
+
this.inputPipeline.addToTail(mapper);
|
299
|
+
}
|
300
|
+
getMatchingTools(type) {
|
301
|
+
return this.tools.filter((tool) => tool instanceof type);
|
302
|
+
}
|
303
|
+
// @internal
|
304
|
+
onEditorDestroyed() {
|
305
|
+
for (const tool of this.tools) {
|
306
|
+
tool.onDestroy();
|
307
|
+
}
|
308
|
+
}
|
309
|
+
}
|
310
|
+
exports.default = ToolController;
|
@@ -0,0 +1 @@
|
|
1
|
+
export {};
|