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
@@ -51,7 +51,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
51
51
|
id: 'polyline-pen',
|
52
52
|
factory: PolylineBuilder_1.makePolylineBuilder,
|
53
53
|
},
|
54
|
-
...
|
54
|
+
...additionalPens.filter((pen) => !pen.isShapeBuilder),
|
55
55
|
// Shape pens
|
56
56
|
{
|
57
57
|
name: this.localizationTable.arrowPen,
|
@@ -83,9 +83,9 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
83
83
|
isShapeBuilder: true,
|
84
84
|
factory: CircleBuilder_1.makeOutlinedCircleBuilder,
|
85
85
|
},
|
86
|
-
...
|
86
|
+
...additionalPens.filter((pen) => pen.isShapeBuilder),
|
87
87
|
].filter(filterPens);
|
88
|
-
this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, toolEvt => {
|
88
|
+
this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, (toolEvt) => {
|
89
89
|
if (toolEvt.kind !== types_1.EditorEventType.ToolUpdated) {
|
90
90
|
throw new Error('Invalid event type!');
|
91
91
|
}
|
@@ -128,7 +128,10 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
128
128
|
style.factory = record.factory;
|
129
129
|
}
|
130
130
|
const strokeFactory = record?.factory;
|
131
|
-
if (!strokeFactory ||
|
131
|
+
if (!strokeFactory ||
|
132
|
+
strokeFactory === FreehandLineBuilder_1.makeFreehandLineBuilder ||
|
133
|
+
strokeFactory === PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder ||
|
134
|
+
strokeFactory === PolylineBuilder_1.makePolylineBuilder) {
|
132
135
|
return this.editor.icons.makePenIcon(style);
|
133
136
|
}
|
134
137
|
else {
|
@@ -148,8 +151,10 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
148
151
|
isShapeBuilder: penType.isShapeBuilder ?? false,
|
149
152
|
};
|
150
153
|
});
|
151
|
-
const
|
152
|
-
const
|
154
|
+
const penItems = allChoices.filter((choice) => !choice.isShapeBuilder);
|
155
|
+
const penSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectPenType, this.getCurrentPenTypeIdx(), penItems);
|
156
|
+
const shapeItems = allChoices.filter((choice) => choice.isShapeBuilder);
|
157
|
+
const shapeSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectShape, this.getCurrentPenTypeIdx(), shapeItems);
|
153
158
|
const onSelectorUpdate = (newPenTypeIndex) => {
|
154
159
|
this.tool.setStrokeFactory(this.penTypes[newPenTypeIndex].factory);
|
155
160
|
};
|
@@ -166,8 +171,12 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
166
171
|
shapeSelector.updateIcons();
|
167
172
|
},
|
168
173
|
addTo: (parent) => {
|
169
|
-
|
170
|
-
|
174
|
+
if (penItems.length) {
|
175
|
+
penSelector.addTo(parent);
|
176
|
+
}
|
177
|
+
if (shapeItems.length) {
|
178
|
+
shapeSelector.addTo(parent);
|
179
|
+
}
|
171
180
|
},
|
172
181
|
};
|
173
182
|
}
|
@@ -205,11 +214,11 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
205
214
|
return result;
|
206
215
|
};
|
207
216
|
const stabilizationOption = addToggleButton(this.localizationTable.inputStabilization, this.editor.icons.makeStrokeSmoothingIcon());
|
208
|
-
stabilizationOption.setOnInputListener(enabled => {
|
217
|
+
stabilizationOption.setOnInputListener((enabled) => {
|
209
218
|
this.tool.setHasStabilization(enabled);
|
210
219
|
});
|
211
220
|
const autocorrectOption = addToggleButton(this.localizationTable.strokeAutocorrect, this.editor.icons.makeShapeAutocorrectIcon());
|
212
|
-
autocorrectOption.setOnInputListener(enabled => {
|
221
|
+
autocorrectOption.setOnInputListener((enabled) => {
|
213
222
|
this.tool.setStrokeAutocorrectEnabled(enabled);
|
214
223
|
});
|
215
224
|
// Help text
|
@@ -232,12 +241,12 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
232
241
|
const container = document.createElement('div');
|
233
242
|
container.classList.add(`${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}nonbutton-controls-main-list`);
|
234
243
|
// Thickness: Value of the input is squared to allow for finer control/larger values.
|
235
|
-
const { container: thicknessRow, setValue: setThickness } = (0, makeThicknessSlider_1.default)(this.editor, thickness => {
|
244
|
+
const { container: thicknessRow, setValue: setThickness } = (0, makeThicknessSlider_1.default)(this.editor, (thickness) => {
|
236
245
|
this.tool.setThickness(thickness);
|
237
246
|
});
|
238
247
|
const colorRow = document.createElement('div');
|
239
248
|
const colorLabel = document.createElement('label');
|
240
|
-
const colorInputControl = (0, makeColorInput_1.default)(this.editor, color => {
|
249
|
+
const colorInputControl = (0, makeColorInput_1.default)(this.editor, (color) => {
|
241
250
|
this.tool.setColor(color);
|
242
251
|
});
|
243
252
|
const { input: colorInput, container: colorInputContainer } = colorInputControl;
|
@@ -306,7 +315,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
|
|
306
315
|
deserializeFrom(state) {
|
307
316
|
super.deserializeFrom(state);
|
308
317
|
const verifyPropertyType = (propertyName, expectedType) => {
|
309
|
-
const actualType = typeof
|
318
|
+
const actualType = typeof state[propertyName];
|
310
319
|
if (actualType !== expectedType) {
|
311
320
|
throw new Error(`Deserializing property ${propertyName}: Invalid type. Expected ${expectedType},` +
|
312
321
|
` was ${actualType}.`);
|
@@ -18,7 +18,7 @@ const makeFormatMenu = (editor, selectionTool, localizationTable) => {
|
|
18
18
|
container.classList.add('selection-format-menu', `${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}indentedList`);
|
19
19
|
const colorRow = document.createElement('div');
|
20
20
|
const colorLabel = document.createElement('label');
|
21
|
-
const colorInputControl = (0, makeColorInput_1.default)(editor, color => {
|
21
|
+
const colorInputControl = (0, makeColorInput_1.default)(editor, (color) => {
|
22
22
|
const selection = selectionTool.getSelection();
|
23
23
|
if (selection) {
|
24
24
|
const updateStyleCommands = [];
|
@@ -99,7 +99,7 @@ class SelectionToolWidget extends BaseToolWidget_1.default {
|
|
99
99
|
};
|
100
100
|
updateDisabled(true);
|
101
101
|
// Enable/disable actions based on whether items are selected
|
102
|
-
this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, toolEvt => {
|
102
|
+
this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, (toolEvt) => {
|
103
103
|
if (toolEvt.kind !== types_1.EditorEventType.ToolUpdated) {
|
104
104
|
throw new Error('Invalid event type!');
|
105
105
|
}
|
@@ -13,7 +13,7 @@ class TextToolWidget extends BaseToolWidget_1.default {
|
|
13
13
|
super(editor, tool, 'text-tool-widget', localization);
|
14
14
|
this.tool = tool;
|
15
15
|
this.updateDropdownInputs = null;
|
16
|
-
editor.notifier.on(types_1.EditorEventType.ToolUpdated, evt => {
|
16
|
+
editor.notifier.on(types_1.EditorEventType.ToolUpdated, (evt) => {
|
17
17
|
if (evt.kind === types_1.EditorEventType.ToolUpdated && evt.tool === tool) {
|
18
18
|
this.updateIcon();
|
19
19
|
this.updateDropdownInputs?.();
|
@@ -37,7 +37,7 @@ class TextToolWidget extends BaseToolWidget_1.default {
|
|
37
37
|
const fontLabel = document.createElement('label');
|
38
38
|
const sizeInput = document.createElement('input');
|
39
39
|
const sizeLabel = document.createElement('label');
|
40
|
-
const { input: colorInput, container: colorInputContainer, setValue: setColorInputValue } = (0, makeColorInput_1.default)(this.editor, color => {
|
40
|
+
const { input: colorInput, container: colorInputContainer, setValue: setColorInputValue, } = (0, makeColorInput_1.default)(this.editor, (color) => {
|
41
41
|
this.tool.setColor(color);
|
42
42
|
});
|
43
43
|
const colorLabel = document.createElement('label');
|
@@ -105,13 +105,13 @@ class TextToolWidget extends BaseToolWidget_1.default {
|
|
105
105
|
};
|
106
106
|
}
|
107
107
|
deserializeFrom(state) {
|
108
|
-
if (state.fontFamily && typeof
|
108
|
+
if (state.fontFamily && typeof state.fontFamily === 'string') {
|
109
109
|
this.tool.setFontFamily(state.fontFamily);
|
110
110
|
}
|
111
|
-
if (state.color && typeof
|
111
|
+
if (state.color && typeof state.color === 'string') {
|
112
112
|
this.tool.setColor(math_1.Color4.fromHex(state.color));
|
113
113
|
}
|
114
|
-
if (state.textSize && typeof
|
114
|
+
if (state.textSize && typeof state.textSize === 'number') {
|
115
115
|
this.tool.setFontSize(state.textSize);
|
116
116
|
}
|
117
117
|
super.deserializeFrom(state);
|
@@ -47,7 +47,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
47
47
|
icon.style.display = 'none';
|
48
48
|
}
|
49
49
|
else if (files.length > 0) {
|
50
|
-
const fileNames = files.map(file => file.name);
|
50
|
+
const fileNames = files.map((file) => file.name);
|
51
51
|
const maxNames = 5;
|
52
52
|
if (fileNames.length <= maxNames) {
|
53
53
|
descriptionText.textContent = fileNames.join('\n');
|
@@ -89,15 +89,15 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
89
89
|
};
|
90
90
|
const addFileEventListeners = () => {
|
91
91
|
// Support dropping files
|
92
|
-
label.addEventListener('dragover', event => {
|
92
|
+
label.addEventListener('dragover', (event) => {
|
93
93
|
event.preventDefault();
|
94
94
|
label.classList.add('drag-target');
|
95
95
|
});
|
96
|
-
label.addEventListener('dragenter', event => {
|
96
|
+
label.addEventListener('dragenter', (event) => {
|
97
97
|
event.preventDefault();
|
98
98
|
label.classList.add('drag-target');
|
99
99
|
});
|
100
|
-
label.addEventListener('dragleave', event => {
|
100
|
+
label.addEventListener('dragleave', (event) => {
|
101
101
|
event.preventDefault();
|
102
102
|
// Ensure the event wasn't targeting a child.
|
103
103
|
// See https://stackoverflow.com/a/54271161 and
|
@@ -108,7 +108,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
108
108
|
}
|
109
109
|
});
|
110
110
|
// See https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop#process_the_drop
|
111
|
-
label.addEventListener('drop', event => {
|
111
|
+
label.addEventListener('drop', (event) => {
|
112
112
|
event.preventDefault();
|
113
113
|
label.classList.remove('drag-target');
|
114
114
|
const fileList = [];
|
@@ -137,7 +137,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
137
137
|
const data = await customPickerAction({
|
138
138
|
setOnCancelCallback: (onCancel) => {
|
139
139
|
if (!loading) {
|
140
|
-
throw new Error(
|
140
|
+
throw new Error("Task already completed. Can't register cancel handler.");
|
141
141
|
}
|
142
142
|
cancelLoading = () => {
|
143
143
|
cancelLoading = null;
|
@@ -159,7 +159,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
159
159
|
};
|
160
160
|
input.onclick = promptForFiles;
|
161
161
|
}
|
162
|
-
selectedFiles.onUpdate(files => {
|
162
|
+
selectedFiles.onUpdate((files) => {
|
163
163
|
if (files.length === 0 && input.files && input.files.length > 0) {
|
164
164
|
input.value = '';
|
165
165
|
}
|
@@ -26,7 +26,7 @@ labelText, defaultId, choices) => {
|
|
26
26
|
menuContainer.id = `${constants_1.toolbarCSSPrefix}-grid-select-id-${idCounter++}`;
|
27
27
|
(0, stopPropagationOfScrollingWheelEvents_1.default)(menuContainer);
|
28
28
|
const label = document.createElement('label');
|
29
|
-
label.
|
29
|
+
label.textContent = labelText;
|
30
30
|
label.htmlFor = menuContainer.id;
|
31
31
|
outerContainer.appendChild(label);
|
32
32
|
// All buttons in a radiogroup need the same name attribute.
|
@@ -88,7 +88,7 @@ labelText, defaultId, choices) => {
|
|
88
88
|
// Prevent the right-click menu from being shown on long-press
|
89
89
|
// (important for some toolbars that use long-press gestures to
|
90
90
|
// show grid selector labels).
|
91
|
-
buttonContainer.oncontextmenu = event => {
|
91
|
+
buttonContainer.oncontextmenu = (event) => {
|
92
92
|
event.preventDefault();
|
93
93
|
};
|
94
94
|
buttonContainer.replaceChildren(button, labelContainer);
|
@@ -107,7 +107,7 @@ labelText, defaultId, choices) => {
|
|
107
107
|
choiceRecord: record,
|
108
108
|
setChecked,
|
109
109
|
updateIcon,
|
110
|
-
updateButtonRadiogroupName
|
110
|
+
updateButtonRadiogroupName,
|
111
111
|
};
|
112
112
|
};
|
113
113
|
const buttons = [];
|
@@ -118,7 +118,7 @@ labelText, defaultId, choices) => {
|
|
118
118
|
// However, it is still possible that selectedValue does not correspond
|
119
119
|
// to a choice in `choices`. This is acceptable.
|
120
120
|
outerContainer.appendChild(menuContainer);
|
121
|
-
selectedValue.onUpdateAndNow(choiceId => {
|
121
|
+
selectedValue.onUpdateAndNow((choiceId) => {
|
122
122
|
for (let i = 0; i < buttons.length; i++) {
|
123
123
|
buttons[i].setChecked(buttons[i].choiceRecord.id === choiceId);
|
124
124
|
}
|
@@ -134,7 +134,7 @@ labelText, defaultId, choices) => {
|
|
134
134
|
}
|
135
135
|
},
|
136
136
|
updateIcons: () => {
|
137
|
-
buttons.forEach(button => button.updateIcon());
|
137
|
+
buttons.forEach((button) => button.updateIcon());
|
138
138
|
},
|
139
139
|
getRootElement() {
|
140
140
|
return outerContainer;
|
@@ -22,7 +22,10 @@ const makeSnappedList = (itemsValue) => {
|
|
22
22
|
// TODO: Does it make sense for the page marker list to be focusable?
|
23
23
|
markerContainer.setAttribute('tabindex', '-1');
|
24
24
|
const markers = [];
|
25
|
-
const pairedItems = ReactiveValue_1.ReactiveValue.union([
|
25
|
+
const pairedItems = ReactiveValue_1.ReactiveValue.union([
|
26
|
+
visibleIndex,
|
27
|
+
itemsValue,
|
28
|
+
]);
|
26
29
|
pairedItems.onUpdateAndNow(([currentVisibleIndex, items]) => {
|
27
30
|
let addedOrRemovedMarkers = false;
|
28
31
|
// Items may have been removed from the list of pages. Make the markers reflect that.
|
@@ -56,7 +59,8 @@ const makeSnappedList = (itemsValue) => {
|
|
56
59
|
}
|
57
60
|
const markerIndex = i;
|
58
61
|
marker.onclick = () => {
|
59
|
-
wrappedItems
|
62
|
+
wrappedItems
|
63
|
+
.get()[markerIndex]?.element?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
|
60
64
|
};
|
61
65
|
}
|
62
66
|
// Only call .replaceChildren when necessary -- doing so on every change would
|
@@ -104,7 +108,7 @@ const makeSnappedList = (itemsValue) => {
|
|
104
108
|
observer = null;
|
105
109
|
}
|
106
110
|
};
|
107
|
-
const wrappedItems = ReactiveValue_1.ReactiveValue.map(itemsValue, items => {
|
111
|
+
const wrappedItems = ReactiveValue_1.ReactiveValue.map(itemsValue, (items) => {
|
108
112
|
return items.map((item, index) => {
|
109
113
|
const wrapper = document.createElement('div');
|
110
114
|
if (item.element.parentElement)
|
@@ -119,7 +123,7 @@ const makeSnappedList = (itemsValue) => {
|
|
119
123
|
});
|
120
124
|
});
|
121
125
|
const lastItems = [];
|
122
|
-
wrappedItems.onUpdateAndNow(items => {
|
126
|
+
wrappedItems.onUpdateAndNow((items) => {
|
123
127
|
visibleIndex.set(-1);
|
124
128
|
for (const item of lastItems) {
|
125
129
|
observer?.unobserve(item.element);
|
@@ -149,7 +153,7 @@ const makeSnappedList = (itemsValue) => {
|
|
149
153
|
}
|
150
154
|
}
|
151
155
|
});
|
152
|
-
const visibleItem = ReactiveValue_1.ReactiveValue.map(visibleIndex, index => {
|
156
|
+
const visibleItem = ReactiveValue_1.ReactiveValue.map(visibleIndex, (index) => {
|
153
157
|
const values = itemsValue.get();
|
154
158
|
if (0 <= index && index < values.length) {
|
155
159
|
return values[index].data;
|
@@ -9,10 +9,10 @@ const KeyboardShortcutManager_1 = __importDefault(require("../../shortcuts/Keybo
|
|
9
9
|
exports.resizeImageToSelectionKeyboardShortcut = 'jsdraw.toolbar.SelectionTool.resizeImageToSelection';
|
10
10
|
KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(exports.resizeImageToSelectionKeyboardShortcut, ['ctrlOrMeta+r'], 'Resize image to selection');
|
11
11
|
// Pen tool
|
12
|
-
exports.selectStrokeTypeKeyboardShortcutIds = [1, 2, 3, 4, 5, 6, 7, 8, 9].map(id => `jsdraw.toolbar.PenTool.select-pen-${id}`);
|
12
|
+
exports.selectStrokeTypeKeyboardShortcutIds = [1, 2, 3, 4, 5, 6, 7, 8, 9].map((id) => `jsdraw.toolbar.PenTool.select-pen-${id}`);
|
13
13
|
for (let i = 0; i < exports.selectStrokeTypeKeyboardShortcutIds.length; i++) {
|
14
14
|
const id = exports.selectStrokeTypeKeyboardShortcutIds[i];
|
15
|
-
KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(id, [`CtrlOrMeta+Digit${
|
15
|
+
KeyboardShortcutManager_1.default.registerDefaultKeyboardShortcut(id, [`CtrlOrMeta+Digit${i + 1}`], 'Select pen style ' + (i + 1));
|
16
16
|
}
|
17
17
|
// Save
|
18
18
|
exports.saveKeyboardShortcut = 'jsdraw.toolbar.SaveActionWidget.save';
|
@@ -49,7 +49,7 @@ class Dropdown {
|
|
49
49
|
}
|
50
50
|
// Shift the dropdown if it's off the screen, but only if doing so moves it on to the screen
|
51
51
|
// (prevents dropdowns from going almost completely offscreen on small screens).
|
52
|
-
if (dropdownBBox.bottom > screenHeight &&
|
52
|
+
if (dropdownBBox.bottom > screenHeight && dropdownBBox.top - dropdownBBox.height > 0) {
|
53
53
|
const targetElem = this.parent.target;
|
54
54
|
translateY = `calc(-${targetElem.clientHeight}px - 100%)`;
|
55
55
|
}
|
@@ -136,7 +136,7 @@ class DropdownLayoutManager {
|
|
136
136
|
return;
|
137
137
|
announceForAccessibility(this.localization.dropdownShown(dropdown.parent.getTitle()));
|
138
138
|
// Share the event with other connected notifiers
|
139
|
-
this.connectedNotifiers.forEach(notifier => {
|
139
|
+
this.connectedNotifiers.forEach((notifier) => {
|
140
140
|
notifier.dispatch(types_1.EditorEventType.ToolbarDropdownShown, {
|
141
141
|
kind: types_1.EditorEventType.ToolbarDropdownShown,
|
142
142
|
fromToplevelDropdown,
|
@@ -173,7 +173,7 @@ class DropdownLayoutManager {
|
|
173
173
|
refreshListeners() {
|
174
174
|
const clearListeners = () => {
|
175
175
|
// Remove all listeners & resources that won't be garbage collected.
|
176
|
-
this.listeners.forEach(l => l.remove());
|
176
|
+
this.listeners.forEach((l) => l.remove());
|
177
177
|
this.listeners = [];
|
178
178
|
};
|
179
179
|
if (this.dropdowns.size === 0) {
|
@@ -181,11 +181,11 @@ class DropdownLayoutManager {
|
|
181
181
|
}
|
182
182
|
else if (this.listeners.length !== this.connectedNotifiers.length) {
|
183
183
|
clearListeners();
|
184
|
-
this.listeners = this.connectedNotifiers.map(notifier => {
|
184
|
+
this.listeners = this.connectedNotifiers.map((notifier) => {
|
185
185
|
return notifier.on(types_1.EditorEventType.ToolbarDropdownShown, (evt) => {
|
186
|
-
if (evt.kind !== types_1.EditorEventType.ToolbarDropdownShown
|
186
|
+
if (evt.kind !== types_1.EditorEventType.ToolbarDropdownShown ||
|
187
187
|
// Don't forward to ourselves events that we originally triggered.
|
188
|
-
|
188
|
+
evt.layoutManager === this) {
|
189
189
|
return;
|
190
190
|
}
|
191
191
|
this.notifier.dispatch(DropdownEventType.DropdownShown, {
|
@@ -0,0 +1,61 @@
|
|
1
|
+
import { EditorNotifier } from '../types';
|
2
|
+
import { WheelEvt, PointerEvt, KeyPressEvent, KeyUpEvent, PasteEvent, CopyEvent, InputEvt, GestureCancelEvt, PointerDownEvt, PointerMoveEvt, PointerUpEvt, ContextMenuEvt } from '../inputEvents';
|
3
|
+
import ToolEnabledGroup from './ToolEnabledGroup';
|
4
|
+
import InputMapper, { InputEventListener } from './InputFilter/InputMapper';
|
5
|
+
import { ReactiveValue } from '../util/ReactiveValue';
|
6
|
+
export default abstract class BaseTool implements InputEventListener {
|
7
|
+
#private;
|
8
|
+
private notifier;
|
9
|
+
readonly description: string;
|
10
|
+
protected constructor(notifier: EditorNotifier, description: string);
|
11
|
+
/** Override this to allow this tool to be enabled in a read-only editor */
|
12
|
+
canReceiveInputInReadOnlyEditor(): boolean;
|
13
|
+
setInputMapper(mapper: InputMapper | null): void;
|
14
|
+
getInputMapper(): InputMapper | null;
|
15
|
+
private dispatchEventToCallback;
|
16
|
+
onEvent(event: InputEvt): boolean;
|
17
|
+
/**
|
18
|
+
* Returns true iff the tool handled the event and thus should receive additional
|
19
|
+
* events.
|
20
|
+
*/
|
21
|
+
onPointerDown(_event: PointerDownEvt): boolean;
|
22
|
+
onPointerMove(_event: PointerMoveEvt): void;
|
23
|
+
/**
|
24
|
+
* Returns true iff there are additional pointers down and the tool should
|
25
|
+
* remain active to handle the additional events.
|
26
|
+
*
|
27
|
+
* For most purposes, this should return `false` or nothing.
|
28
|
+
*/
|
29
|
+
onPointerUp(_event: PointerUpEvt): boolean | void;
|
30
|
+
onGestureCancel(_event: GestureCancelEvt): void;
|
31
|
+
onWheel(_event: WheelEvt): boolean;
|
32
|
+
onCopy(_event: CopyEvent): boolean;
|
33
|
+
onPaste(_event: PasteEvent): boolean;
|
34
|
+
onKeyPress(_event: KeyPressEvent): boolean;
|
35
|
+
onKeyUp(_event: KeyUpEvent): boolean;
|
36
|
+
onContextMenu(_event: ContextMenuEvt): boolean;
|
37
|
+
/**
|
38
|
+
* Return true if, while this tool is active, `_event` can be delivered to
|
39
|
+
* another tool that is higher priority than this.
|
40
|
+
* @internal May be renamed
|
41
|
+
*/
|
42
|
+
eventCanBeDeliveredToNonActiveTool(_event: PointerEvt): boolean;
|
43
|
+
setEnabled(enabled: boolean): void;
|
44
|
+
isEnabled(): boolean;
|
45
|
+
/**
|
46
|
+
* Returns a {@link ReactiveValue} that updates based on whether this tool is
|
47
|
+
* enabled.
|
48
|
+
*
|
49
|
+
* @example
|
50
|
+
* ```ts
|
51
|
+
* const tool = new SomeTool();
|
52
|
+
*
|
53
|
+
* // Watch for changes in enabled status
|
54
|
+
* tool.enabledValue().onUpdate(enabled => doSomething(enabled));
|
55
|
+
* ```
|
56
|
+
*/
|
57
|
+
enabledValue(): ReactiveValue<boolean>;
|
58
|
+
setToolGroup(group: ToolEnabledGroup): void;
|
59
|
+
getToolGroup(): ToolEnabledGroup | null;
|
60
|
+
onDestroy(): void;
|
61
|
+
}
|
@@ -0,0 +1,181 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
3
|
+
if (kind === "m") throw new TypeError("Private method is not writable");
|
4
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
5
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
6
|
+
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
7
|
+
};
|
8
|
+
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
9
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
10
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
11
|
+
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
12
|
+
};
|
13
|
+
var _BaseTool_enabled, _BaseTool_group, _BaseTool_inputMapper, _BaseTool_readOnlyEditorChangeListener;
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
15
|
+
const types_1 = require("../types");
|
16
|
+
const inputEvents_1 = require("../inputEvents");
|
17
|
+
const ReactiveValue_1 = require("../util/ReactiveValue");
|
18
|
+
class BaseTool {
|
19
|
+
constructor(notifier, description) {
|
20
|
+
this.notifier = notifier;
|
21
|
+
this.description = description;
|
22
|
+
_BaseTool_enabled.set(this, void 0);
|
23
|
+
_BaseTool_group.set(this, null);
|
24
|
+
_BaseTool_inputMapper.set(this, null);
|
25
|
+
_BaseTool_readOnlyEditorChangeListener.set(this, null);
|
26
|
+
__classPrivateFieldSet(this, _BaseTool_enabled, ReactiveValue_1.ReactiveValue.fromInitialValue(true), "f");
|
27
|
+
__classPrivateFieldGet(this, _BaseTool_enabled, "f").onUpdate((enabled) => {
|
28
|
+
// Ensure that at most one tool in the group is enabled.
|
29
|
+
if (enabled) {
|
30
|
+
__classPrivateFieldGet(this, _BaseTool_group, "f")?.notifyEnabled(this);
|
31
|
+
this.notifier.dispatch(types_1.EditorEventType.ToolEnabled, {
|
32
|
+
kind: types_1.EditorEventType.ToolEnabled,
|
33
|
+
tool: this,
|
34
|
+
});
|
35
|
+
}
|
36
|
+
else {
|
37
|
+
this.notifier.dispatch(types_1.EditorEventType.ToolDisabled, {
|
38
|
+
kind: types_1.EditorEventType.ToolDisabled,
|
39
|
+
tool: this,
|
40
|
+
});
|
41
|
+
}
|
42
|
+
});
|
43
|
+
}
|
44
|
+
/** Override this to allow this tool to be enabled in a read-only editor */
|
45
|
+
canReceiveInputInReadOnlyEditor() {
|
46
|
+
return false;
|
47
|
+
}
|
48
|
+
setInputMapper(mapper) {
|
49
|
+
__classPrivateFieldSet(this, _BaseTool_inputMapper, mapper, "f");
|
50
|
+
if (mapper) {
|
51
|
+
mapper.setEmitListener((event) => this.dispatchEventToCallback(event));
|
52
|
+
}
|
53
|
+
}
|
54
|
+
getInputMapper() {
|
55
|
+
return __classPrivateFieldGet(this, _BaseTool_inputMapper, "f");
|
56
|
+
}
|
57
|
+
dispatchEventToCallback(event) {
|
58
|
+
let exhaustivenessCheck;
|
59
|
+
switch (event.kind) {
|
60
|
+
case inputEvents_1.InputEvtType.PointerDownEvt:
|
61
|
+
return this.onPointerDown(event);
|
62
|
+
case inputEvents_1.InputEvtType.PointerMoveEvt:
|
63
|
+
this.onPointerMove(event);
|
64
|
+
break;
|
65
|
+
case inputEvents_1.InputEvtType.PointerUpEvt:
|
66
|
+
return this.onPointerUp(event) ?? false;
|
67
|
+
case inputEvents_1.InputEvtType.GestureCancelEvt:
|
68
|
+
this.onGestureCancel(event);
|
69
|
+
break;
|
70
|
+
case inputEvents_1.InputEvtType.WheelEvt:
|
71
|
+
return this.onWheel(event);
|
72
|
+
case inputEvents_1.InputEvtType.KeyPressEvent:
|
73
|
+
return this.onKeyPress(event);
|
74
|
+
case inputEvents_1.InputEvtType.KeyUpEvent:
|
75
|
+
return this.onKeyUp(event);
|
76
|
+
case inputEvents_1.InputEvtType.CopyEvent:
|
77
|
+
return this.onCopy(event);
|
78
|
+
case inputEvents_1.InputEvtType.PasteEvent:
|
79
|
+
return this.onPaste(event);
|
80
|
+
case inputEvents_1.InputEvtType.ContextMenu:
|
81
|
+
return this.onContextMenu(event);
|
82
|
+
default:
|
83
|
+
exhaustivenessCheck = event;
|
84
|
+
return exhaustivenessCheck;
|
85
|
+
}
|
86
|
+
return true;
|
87
|
+
}
|
88
|
+
// @internal
|
89
|
+
onEvent(event) {
|
90
|
+
if (__classPrivateFieldGet(this, _BaseTool_inputMapper, "f")) {
|
91
|
+
return __classPrivateFieldGet(this, _BaseTool_inputMapper, "f").onEvent(event);
|
92
|
+
}
|
93
|
+
return this.dispatchEventToCallback(event);
|
94
|
+
}
|
95
|
+
/**
|
96
|
+
* Returns true iff the tool handled the event and thus should receive additional
|
97
|
+
* events.
|
98
|
+
*/
|
99
|
+
onPointerDown(_event) {
|
100
|
+
return false;
|
101
|
+
}
|
102
|
+
onPointerMove(_event) { }
|
103
|
+
/**
|
104
|
+
* Returns true iff there are additional pointers down and the tool should
|
105
|
+
* remain active to handle the additional events.
|
106
|
+
*
|
107
|
+
* For most purposes, this should return `false` or nothing.
|
108
|
+
*/
|
109
|
+
onPointerUp(_event) { }
|
110
|
+
onGestureCancel(_event) { }
|
111
|
+
onWheel(_event) {
|
112
|
+
return false;
|
113
|
+
}
|
114
|
+
onCopy(_event) {
|
115
|
+
return false;
|
116
|
+
}
|
117
|
+
onPaste(_event) {
|
118
|
+
return false;
|
119
|
+
}
|
120
|
+
onKeyPress(_event) {
|
121
|
+
return false;
|
122
|
+
}
|
123
|
+
onKeyUp(_event) {
|
124
|
+
return false;
|
125
|
+
}
|
126
|
+
onContextMenu(_event) {
|
127
|
+
return false;
|
128
|
+
}
|
129
|
+
/**
|
130
|
+
* Return true if, while this tool is active, `_event` can be delivered to
|
131
|
+
* another tool that is higher priority than this.
|
132
|
+
* @internal May be renamed
|
133
|
+
*/
|
134
|
+
eventCanBeDeliveredToNonActiveTool(_event) {
|
135
|
+
return true;
|
136
|
+
}
|
137
|
+
setEnabled(enabled) {
|
138
|
+
__classPrivateFieldGet(this, _BaseTool_enabled, "f").set(enabled);
|
139
|
+
}
|
140
|
+
isEnabled() {
|
141
|
+
return __classPrivateFieldGet(this, _BaseTool_enabled, "f").get();
|
142
|
+
}
|
143
|
+
/**
|
144
|
+
* Returns a {@link ReactiveValue} that updates based on whether this tool is
|
145
|
+
* enabled.
|
146
|
+
*
|
147
|
+
* @example
|
148
|
+
* ```ts
|
149
|
+
* const tool = new SomeTool();
|
150
|
+
*
|
151
|
+
* // Watch for changes in enabled status
|
152
|
+
* tool.enabledValue().onUpdate(enabled => doSomething(enabled));
|
153
|
+
* ```
|
154
|
+
*/
|
155
|
+
enabledValue() {
|
156
|
+
return __classPrivateFieldGet(this, _BaseTool_enabled, "f");
|
157
|
+
}
|
158
|
+
// Connect this tool to a set of other tools, ensuring that at most one
|
159
|
+
// of the tools in the group is enabled.
|
160
|
+
setToolGroup(group) {
|
161
|
+
if (this.isEnabled()) {
|
162
|
+
group.notifyEnabled(this);
|
163
|
+
}
|
164
|
+
__classPrivateFieldSet(this, _BaseTool_group, group, "f");
|
165
|
+
}
|
166
|
+
getToolGroup() {
|
167
|
+
if (__classPrivateFieldGet(this, _BaseTool_group, "f")) {
|
168
|
+
return __classPrivateFieldGet(this, _BaseTool_group, "f");
|
169
|
+
}
|
170
|
+
return null;
|
171
|
+
}
|
172
|
+
// Called when the tool is removed/when the editor is destroyed.
|
173
|
+
// Subclasses that override this method **must call super.onDestroy()**.
|
174
|
+
onDestroy() {
|
175
|
+
__classPrivateFieldGet(this, _BaseTool_readOnlyEditorChangeListener, "f")?.remove();
|
176
|
+
__classPrivateFieldSet(this, _BaseTool_readOnlyEditorChangeListener, null, "f");
|
177
|
+
__classPrivateFieldSet(this, _BaseTool_group, null, "f");
|
178
|
+
}
|
179
|
+
}
|
180
|
+
_BaseTool_enabled = new WeakMap(), _BaseTool_group = new WeakMap(), _BaseTool_inputMapper = new WeakMap(), _BaseTool_readOnlyEditorChangeListener = new WeakMap();
|
181
|
+
exports.default = BaseTool;
|
@@ -0,0 +1,60 @@
|
|
1
|
+
import { GestureCancelEvt, KeyPressEvent, PointerEvt } from '../inputEvents';
|
2
|
+
import BaseTool from './BaseTool';
|
3
|
+
import Editor from '../Editor';
|
4
|
+
import { MutableReactiveValue } from '../util/ReactiveValue';
|
5
|
+
export declare enum EraserMode {
|
6
|
+
PartialStroke = "partial-stroke",
|
7
|
+
FullStroke = "full-stroke"
|
8
|
+
}
|
9
|
+
export interface InitialEraserOptions {
|
10
|
+
thickness?: number;
|
11
|
+
mode?: EraserMode;
|
12
|
+
}
|
13
|
+
/**
|
14
|
+
* A tool that allows a user to erase parts of an image.
|
15
|
+
*/
|
16
|
+
export default class Eraser extends BaseTool {
|
17
|
+
private editor;
|
18
|
+
private lastPoint;
|
19
|
+
private isFirstEraseEvt;
|
20
|
+
private thickness;
|
21
|
+
private thicknessValue;
|
22
|
+
private modeValue;
|
23
|
+
private toRemove;
|
24
|
+
private toAdd;
|
25
|
+
private eraseCommands;
|
26
|
+
private addCommands;
|
27
|
+
constructor(editor: Editor, description: string, options?: InitialEraserOptions);
|
28
|
+
/**
|
29
|
+
* @returns a tool that briefly enables the eraser when a physical eraser is used.
|
30
|
+
* This tool should be added to the tool list after the primary tools.
|
31
|
+
*/
|
32
|
+
makeEraserSwitcherTool(): BaseTool;
|
33
|
+
private clearPreview;
|
34
|
+
private getSizeOnCanvas;
|
35
|
+
private drawPreviewAt;
|
36
|
+
/**
|
37
|
+
* @returns the eraser rectangle in canvas coordinates.
|
38
|
+
*
|
39
|
+
* For now, all erasers are rectangles or points.
|
40
|
+
*/
|
41
|
+
private getEraserRect;
|
42
|
+
/** Erases in a line from the last point to the current. */
|
43
|
+
private eraseTo;
|
44
|
+
onPointerDown(event: PointerEvt): boolean;
|
45
|
+
onPointerMove(event: PointerEvt): void;
|
46
|
+
onPointerUp(event: PointerEvt): void;
|
47
|
+
onGestureCancel(_event: GestureCancelEvt): void;
|
48
|
+
onKeyPress(event: KeyPressEvent): boolean;
|
49
|
+
/** Returns the side-length of the tip of this eraser. */
|
50
|
+
getThickness(): number;
|
51
|
+
/** Sets the side-length of this' tip. */
|
52
|
+
setThickness(thickness: number): void;
|
53
|
+
/**
|
54
|
+
* Returns a {@link MutableReactiveValue} that can be used to watch
|
55
|
+
* this tool's thickness.
|
56
|
+
*/
|
57
|
+
getThicknessValue(): MutableReactiveValue<number>;
|
58
|
+
/** @returns An object that allows switching between a full stroke and a partial stroke eraser. */
|
59
|
+
getModeValue(): MutableReactiveValue<EraserMode>;
|
60
|
+
}
|