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,126 @@
|
|
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 waitForTimeout_1 = __importDefault(require("../../util/waitForTimeout"));
|
7
|
+
const types_1 = require("../../types");
|
8
|
+
let idCounter = 0;
|
9
|
+
const createMenuOverlay = async (editor, canvasAnchor, options) => {
|
10
|
+
const overlay = document.createElement('div');
|
11
|
+
const { remove: removeOverlay } = editor.createHTMLOverlay(overlay);
|
12
|
+
const menuModal = document.createElement('dialog');
|
13
|
+
menuModal.classList.add('editor-popup-menu');
|
14
|
+
const hideMenuTimeout = 240;
|
15
|
+
menuModal.style.setProperty('--hide-menu-animation-timeout', `${hideMenuTimeout}ms`);
|
16
|
+
const updateMenuLocation = () => {
|
17
|
+
const overlayRect = editor.getOutputBBoxInDOM();
|
18
|
+
const anchor = editor.viewport.canvasToScreen(canvasAnchor).plus(overlayRect.topLeft);
|
19
|
+
menuModal.style.setProperty('--anchor-x', `${anchor.x}px`);
|
20
|
+
menuModal.style.setProperty('--anchor-y', `${anchor.y}px`);
|
21
|
+
};
|
22
|
+
updateMenuLocation();
|
23
|
+
const viewportChangeListener = editor.notifier.on(types_1.EditorEventType.ViewportChanged, updateMenuLocation);
|
24
|
+
overlay.appendChild(menuModal);
|
25
|
+
let dismissing = false;
|
26
|
+
const dismissMenu = async () => {
|
27
|
+
if (dismissing)
|
28
|
+
return;
|
29
|
+
dismissing = true;
|
30
|
+
viewportChangeListener.remove();
|
31
|
+
menuModal.classList.add('-hide');
|
32
|
+
await (0, waitForTimeout_1.default)(hideMenuTimeout);
|
33
|
+
menuModal.close();
|
34
|
+
};
|
35
|
+
return new Promise((resolve) => {
|
36
|
+
let resolved = false;
|
37
|
+
let result = null;
|
38
|
+
const resolveWithSelectedResult = () => {
|
39
|
+
if (!resolved) {
|
40
|
+
resolve(result);
|
41
|
+
resolved = true;
|
42
|
+
}
|
43
|
+
};
|
44
|
+
menuModal.onclose = () => {
|
45
|
+
removeOverlay();
|
46
|
+
resolveWithSelectedResult();
|
47
|
+
};
|
48
|
+
const onOptionSelected = (key) => {
|
49
|
+
result = key;
|
50
|
+
void dismissMenu();
|
51
|
+
// To properly handle clipboard events, this needs to be called synchronously
|
52
|
+
// and not after a delay:
|
53
|
+
resolveWithSelectedResult();
|
54
|
+
};
|
55
|
+
editor.handlePointerEventsExceptClicksFrom(menuModal, (eventName, event) => {
|
56
|
+
if (event.target === menuModal && eventName === 'pointerdown') {
|
57
|
+
void dismissMenu();
|
58
|
+
return true;
|
59
|
+
}
|
60
|
+
else if (dismissing) {
|
61
|
+
// Send pointer events to the editor if the dialog is in the process of being
|
62
|
+
// dismissed (e.g. pointermove events just after a pointerdown outside of the
|
63
|
+
// editor).
|
64
|
+
return true;
|
65
|
+
}
|
66
|
+
return false;
|
67
|
+
}, (_eventName, event) => {
|
68
|
+
return event.target === menuModal;
|
69
|
+
});
|
70
|
+
const contentElement = document.createElement('div');
|
71
|
+
contentElement.classList.add('content');
|
72
|
+
contentElement.role = 'menu';
|
73
|
+
const optionElements = [];
|
74
|
+
// Keyboard focus handling as described in
|
75
|
+
// - https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/menu_role and
|
76
|
+
// - https://www.w3.org/WAI/ARIA/apg/patterns/disclosure/examples/disclosure-navigation/
|
77
|
+
contentElement.addEventListener('keydown', (event) => {
|
78
|
+
const focusedIndex = optionElements.findIndex((item) => item === document.activeElement);
|
79
|
+
if (focusedIndex === -1)
|
80
|
+
return;
|
81
|
+
let newFocusedIndex = focusedIndex;
|
82
|
+
if (event.key === 'ArrowDown') {
|
83
|
+
newFocusedIndex++;
|
84
|
+
}
|
85
|
+
else if (event.key === 'ArrowUp') {
|
86
|
+
newFocusedIndex--;
|
87
|
+
}
|
88
|
+
else if (event.key === 'End') {
|
89
|
+
newFocusedIndex = optionElements.length - 1;
|
90
|
+
}
|
91
|
+
else if (event.key === 'Home') {
|
92
|
+
newFocusedIndex = 0;
|
93
|
+
}
|
94
|
+
if (newFocusedIndex < 0) {
|
95
|
+
newFocusedIndex += optionElements.length;
|
96
|
+
}
|
97
|
+
newFocusedIndex %= optionElements.length;
|
98
|
+
if (newFocusedIndex !== focusedIndex) {
|
99
|
+
event.preventDefault();
|
100
|
+
optionElements[newFocusedIndex].focus();
|
101
|
+
}
|
102
|
+
});
|
103
|
+
for (const option of options) {
|
104
|
+
const optionElement = document.createElement('button');
|
105
|
+
optionElement.id = `menu-overlay-option-${idCounter++}`;
|
106
|
+
optionElement.role = 'menuitem';
|
107
|
+
optionElement.classList.add('option', 'editor-popup-menu-option');
|
108
|
+
optionElement.replaceChildren(option.icon(), document.createTextNode(option.text));
|
109
|
+
optionElement.onclick = (event) => {
|
110
|
+
if (event.defaultPrevented)
|
111
|
+
return;
|
112
|
+
onOptionSelected(option.key);
|
113
|
+
};
|
114
|
+
contentElement.appendChild(optionElement);
|
115
|
+
if (optionElements.length === 0) {
|
116
|
+
optionElement.autofocus = true;
|
117
|
+
}
|
118
|
+
optionElements.push(optionElement);
|
119
|
+
}
|
120
|
+
menuModal.appendChild(contentElement);
|
121
|
+
menuModal.showModal();
|
122
|
+
// Ensures that the menu is visible even if triggered near the edge of the screen.
|
123
|
+
contentElement.scrollIntoView({ block: 'nearest' });
|
124
|
+
});
|
125
|
+
};
|
126
|
+
exports.default = createMenuOverlay;
|
@@ -0,0 +1 @@
|
|
1
|
+
export {};
|
@@ -29,7 +29,7 @@ export default class ClipboardHandler {
|
|
29
29
|
* is to be copied. This is done because `ClipboardEvent`s seem to not support attaching
|
30
30
|
* images.
|
31
31
|
*/
|
32
|
-
copy(event?: ClipboardEvent): Promise<void>;
|
32
|
+
copy(event?: ClipboardEvent | DragEvent): Promise<void>;
|
33
33
|
private copyInternal;
|
34
34
|
}
|
35
35
|
export {};
|
@@ -63,20 +63,15 @@ class ClipboardHandler {
|
|
63
63
|
const clipboardData = event?.dataTransfer ?? event?.clipboardData ?? null;
|
64
64
|
const hasEvent = !!clipboardData;
|
65
65
|
const sendPasteEvent = (mime, data) => {
|
66
|
-
return data &&
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
66
|
+
return (data &&
|
67
|
+
editor.toolController.dispatchInputEvent({
|
68
|
+
kind: inputEvents_1.InputEvtType.PasteEvent,
|
69
|
+
mime,
|
70
|
+
data,
|
71
|
+
}));
|
71
72
|
};
|
72
73
|
// Listed in order of precedence
|
73
|
-
const supportedMIMEs = [
|
74
|
-
'image/svg+xml',
|
75
|
-
'text/html',
|
76
|
-
'image/png',
|
77
|
-
'image/jpeg',
|
78
|
-
'text/plain',
|
79
|
-
];
|
74
|
+
const supportedMIMEs = ['image/svg+xml', 'text/html', 'image/png', 'image/jpeg', 'text/plain'];
|
80
75
|
let files = [];
|
81
76
|
const textData = new Map();
|
82
77
|
if (hasEvent) {
|
@@ -110,7 +105,7 @@ class ClipboardHandler {
|
|
110
105
|
}
|
111
106
|
}
|
112
107
|
for (const file of files) {
|
113
|
-
const fileType = file
|
108
|
+
const fileType = file?.type?.toLowerCase();
|
114
109
|
if (fileType !== mime) {
|
115
110
|
continue;
|
116
111
|
}
|
@@ -186,14 +181,19 @@ class ClipboardHandler {
|
|
186
181
|
event?.preventDefault();
|
187
182
|
}
|
188
183
|
const mimeTypes = [...mimeToData.keys()];
|
189
|
-
const hasNonTextMimeTypes = mimeTypes.some(mime => !isTextMimeType(mime));
|
184
|
+
const hasNonTextMimeTypes = mimeTypes.some((mime) => !isTextMimeType(mime));
|
190
185
|
const copyToEvent = (reason) => {
|
191
186
|
if (!event) {
|
192
187
|
throw new Error(`Unable to copy -- no event provided${reason ? `. Original error: ${reason}` : ''}`);
|
193
188
|
}
|
194
189
|
for (const [key, value] of mimeToData.entries()) {
|
195
190
|
if (typeof value === 'string') {
|
196
|
-
|
191
|
+
if ('clipboardData' in event) {
|
192
|
+
event.clipboardData?.setData(key, value);
|
193
|
+
}
|
194
|
+
else {
|
195
|
+
event.dataTransfer?.setData(key, value);
|
196
|
+
}
|
197
197
|
}
|
198
198
|
}
|
199
199
|
};
|
@@ -224,7 +224,9 @@ class ClipboardHandler {
|
|
224
224
|
// Browser support for ClipboardItem.supports is limited as of mid 2024. However, some browsers
|
225
225
|
// that do support `.supports` throw an exception when attempting to copy an unsupported MIME type
|
226
226
|
// (e.g. Firefox).
|
227
|
-
const unsupported = 'supports' in ClipboardItem &&
|
227
|
+
const unsupported = 'supports' in ClipboardItem &&
|
228
|
+
typeof ClipboardItem.supports === 'function' &&
|
229
|
+
!ClipboardItem.supports(key);
|
228
230
|
if (!unsupported) {
|
229
231
|
filteredMimeToData[key] = data;
|
230
232
|
}
|
@@ -234,8 +236,7 @@ class ClipboardHandler {
|
|
234
236
|
const browserMimeToData = removeUnsupportedMime(mapInternalDataToBrowserData(mimeToData));
|
235
237
|
return navigator.clipboard.write([new ClipboardItem(browserMimeToData)]);
|
236
238
|
};
|
237
|
-
const supportsClipboardApi =
|
238
|
-
&& typeof navigator?.clipboard?.write !== 'undefined');
|
239
|
+
const supportsClipboardApi = typeof ClipboardItem !== 'undefined' && typeof navigator?.clipboard?.write !== 'undefined';
|
239
240
|
if (!__classPrivateFieldGet(this, _ClipboardHandler_preferClipboardEvents, "f") && supportsClipboardApi && (hasNonTextMimeTypes || !event)) {
|
240
241
|
let clipboardApiPromise = null;
|
241
242
|
const fallBackToCopyEvent = (reason) => {
|
@@ -14,7 +14,7 @@ var _ReactiveValueImpl_value, _ReactiveValueImpl_onUpdateListeners;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
15
|
exports.MutableReactiveValue = exports.ReactiveValue = void 0;
|
16
16
|
const noOpUpdateListenerResult = {
|
17
|
-
remove() { }
|
17
|
+
remove() { },
|
18
18
|
};
|
19
19
|
/**
|
20
20
|
* An update listener that does nothing. Useful for reactive values
|
@@ -40,8 +40,8 @@ const noOpSetUpdateListener = () => {
|
|
40
40
|
class ReactiveValue {
|
41
41
|
/** Returns a promise that resolves when this value is next changed. */
|
42
42
|
waitForNextUpdate() {
|
43
|
-
return new Promise(resolve => {
|
44
|
-
const listener = this.onUpdate(value => {
|
43
|
+
return new Promise((resolve) => {
|
44
|
+
const listener = this.onUpdate((value) => {
|
45
45
|
listener.remove();
|
46
46
|
resolve(value);
|
47
47
|
});
|
@@ -56,7 +56,7 @@ class ReactiveValue {
|
|
56
56
|
return {
|
57
57
|
get: () => value,
|
58
58
|
onUpdate: noOpSetUpdateListener,
|
59
|
-
onUpdateAndNow: callback => {
|
59
|
+
onUpdateAndNow: (callback) => {
|
60
60
|
callback(value);
|
61
61
|
return noOpUpdateListenerResult;
|
62
62
|
},
|
@@ -72,7 +72,9 @@ class ReactiveValue {
|
|
72
72
|
*/
|
73
73
|
static fromCallback(callback, sourceValues) {
|
74
74
|
const result = new ReactiveValueImpl(callback());
|
75
|
-
const resultRef = window.WeakRef
|
75
|
+
const resultRef = window.WeakRef
|
76
|
+
? new window.WeakRef(result)
|
77
|
+
: { deref: () => result };
|
76
78
|
for (const value of sourceValues) {
|
77
79
|
const listener = value.onUpdate(() => {
|
78
80
|
// Use resultRef to allow `result` to be garbage collected
|
@@ -91,12 +93,12 @@ class ReactiveValue {
|
|
91
93
|
static map(source, map, inverseMap) {
|
92
94
|
const result = ReactiveValue.fromInitialValue(map(source.get()));
|
93
95
|
let expectedResultValue = result.get();
|
94
|
-
source.onUpdate(newValue => {
|
96
|
+
source.onUpdate((newValue) => {
|
95
97
|
expectedResultValue = map(newValue);
|
96
98
|
result.set(expectedResultValue);
|
97
99
|
});
|
98
100
|
if (inverseMap) {
|
99
|
-
result.onUpdate(newValue => {
|
101
|
+
result.onUpdate((newValue) => {
|
100
102
|
// Prevent infinite loops if inverseMap is not a true
|
101
103
|
// inverse.
|
102
104
|
if (newValue !== expectedResultValue) {
|
@@ -108,7 +110,7 @@ class ReactiveValue {
|
|
108
110
|
}
|
109
111
|
static union(values) {
|
110
112
|
return ReactiveValue.fromCallback(() => {
|
111
|
-
return values.map(value => value.get());
|
113
|
+
return values.map((value) => value.get());
|
112
114
|
}, values);
|
113
115
|
}
|
114
116
|
}
|
@@ -116,9 +118,11 @@ exports.ReactiveValue = ReactiveValue;
|
|
116
118
|
class MutableReactiveValue extends ReactiveValue {
|
117
119
|
static fromProperty(sourceValue, propertyName) {
|
118
120
|
const child = ReactiveValue.fromInitialValue(sourceValue.get()[propertyName]);
|
119
|
-
const childRef = window.WeakRef
|
121
|
+
const childRef = window.WeakRef
|
122
|
+
? new window.WeakRef(child)
|
123
|
+
: { deref: () => child };
|
120
124
|
// When the source is updated...
|
121
|
-
const sourceListener = sourceValue.onUpdate(newValue => {
|
125
|
+
const sourceListener = sourceValue.onUpdate((newValue) => {
|
122
126
|
const childValue = childRef.deref();
|
123
127
|
if (childValue) {
|
124
128
|
childValue.set(newValue[propertyName]);
|
@@ -131,7 +135,7 @@ class MutableReactiveValue extends ReactiveValue {
|
|
131
135
|
});
|
132
136
|
// When the child is updated, also apply the update to the
|
133
137
|
// parent.
|
134
|
-
child.onUpdate(newValue => {
|
138
|
+
child.onUpdate((newValue) => {
|
135
139
|
sourceValue.set({
|
136
140
|
...sourceValue.get(),
|
137
141
|
[propertyName]: newValue,
|
@@ -169,7 +173,7 @@ class ReactiveValueImpl extends MutableReactiveValue {
|
|
169
173
|
__classPrivateFieldGet(this, _ReactiveValueImpl_onUpdateListeners, "f").push(listener);
|
170
174
|
return {
|
171
175
|
remove: () => {
|
172
|
-
__classPrivateFieldSet(this, _ReactiveValueImpl_onUpdateListeners, __classPrivateFieldGet(this, _ReactiveValueImpl_onUpdateListeners, "f").filter(otherListener => {
|
176
|
+
__classPrivateFieldSet(this, _ReactiveValueImpl_onUpdateListeners, __classPrivateFieldGet(this, _ReactiveValueImpl_onUpdateListeners, "f").filter((otherListener) => {
|
173
177
|
return otherListener !== listener;
|
174
178
|
}), "f");
|
175
179
|
},
|
@@ -75,8 +75,12 @@ const adjustEditorThemeForContrast = (editor, options) => {
|
|
75
75
|
// true if the variable can be updated
|
76
76
|
updateVar1, updateVar2) => {
|
77
77
|
// Fetch from updatedColors if available -- styles isn't updated dynamically.
|
78
|
-
let color1 = updatedColors[var1]
|
79
|
-
|
78
|
+
let color1 = updatedColors[var1]
|
79
|
+
? updatedColors[var1]
|
80
|
+
: math_1.Color4.fromString(styles.getPropertyValue(var1));
|
81
|
+
let color2 = updatedColors[var2]
|
82
|
+
? updatedColors[var2]
|
83
|
+
: math_1.Color4.fromString(styles.getPropertyValue(var2));
|
80
84
|
// Ensure that color1 has the lesser luminance
|
81
85
|
if (color1.relativeLuminance() < color2.relativeLuminance()) {
|
82
86
|
const tmp = color1;
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
// See https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_code_values for
|
4
4
|
// more
|
5
5
|
const keyToKeyCode = {
|
6
|
-
|
6
|
+
Control: 'ControlLeft',
|
7
7
|
'=': 'Equal',
|
8
8
|
'-': 'Minus',
|
9
9
|
';': 'Semicolon',
|
@@ -21,7 +21,7 @@ const listenForKeyboardEventsFrom = (elem, callbacks) => {
|
|
21
21
|
return a.key === b.key && a.code === b.code;
|
22
22
|
};
|
23
23
|
const isKeyDown = (keyEvent) => {
|
24
|
-
return keysDown.some(other => keyEventsMatch(other, keyEvent));
|
24
|
+
return keysDown.some((other) => keyEventsMatch(other, keyEvent));
|
25
25
|
};
|
26
26
|
const keyEventToRecord = (event) => {
|
27
27
|
return {
|
@@ -47,10 +47,11 @@ const listenForKeyboardEventsFrom = (elem, callbacks) => {
|
|
47
47
|
}
|
48
48
|
callbacks.handleKeyDown(htmlEvent);
|
49
49
|
}
|
50
|
-
else {
|
50
|
+
else {
|
51
|
+
// keyup
|
51
52
|
console.assert(htmlEvent.type === 'keyup');
|
52
53
|
// Remove the key from keysDown -- it's no longer down.
|
53
|
-
keysDown = keysDown.filter(event => {
|
54
|
+
keysDown = keysDown.filter((event) => {
|
54
55
|
const matches = keyEventsMatch(event, htmlEvent);
|
55
56
|
return !matches;
|
56
57
|
});
|
@@ -60,17 +61,18 @@ const listenForKeyboardEventsFrom = (elem, callbacks) => {
|
|
60
61
|
callbacks.handleKeyUp(htmlEvent);
|
61
62
|
}
|
62
63
|
};
|
63
|
-
elem.addEventListener('keydown', htmlEvent => {
|
64
|
+
elem.addEventListener('keydown', (htmlEvent) => {
|
64
65
|
handleKeyEvent(htmlEvent);
|
65
66
|
});
|
66
|
-
elem.addEventListener('keyup', htmlEvent => {
|
67
|
+
elem.addEventListener('keyup', (htmlEvent) => {
|
67
68
|
handleKeyEvent(htmlEvent);
|
68
69
|
});
|
69
70
|
elem.addEventListener('focusout', (focusEvent) => {
|
70
71
|
let stillHasFocus = false;
|
71
72
|
if (focusEvent.relatedTarget) {
|
72
73
|
const relatedTarget = focusEvent.relatedTarget;
|
73
|
-
stillHasFocus =
|
74
|
+
stillHasFocus =
|
75
|
+
elem.contains(relatedTarget) || callbacks.getHandlesKeyEventsFrom(relatedTarget);
|
74
76
|
}
|
75
77
|
if (!stillHasFocus) {
|
76
78
|
for (const event of keysDown) {
|
@@ -8,11 +8,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
*/
|
9
9
|
const waitForAll = (results) => {
|
10
10
|
// If any are Promises...
|
11
|
-
if (results.some(command => command && command['then'])) {
|
11
|
+
if (results.some((command) => command && command['then'])) {
|
12
12
|
// Wait for all commands to finish.
|
13
|
-
return Promise.all(results)
|
13
|
+
return (Promise.all(results)
|
14
14
|
// Ensure we return a Promise<void> and not a Promise<void[]>
|
15
|
-
.then(() => { });
|
15
|
+
.then(() => { }));
|
16
16
|
}
|
17
17
|
return;
|
18
18
|
};
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const waitForImageLoad = async (image) => {
|
4
4
|
if (!image.complete) {
|
5
5
|
await new Promise((resolve, reject) => {
|
6
|
-
image.onload = event => resolve(event);
|
6
|
+
image.onload = (event) => resolve(event);
|
7
7
|
// TODO(v2): Return a `new Error(event.message)`
|
8
8
|
// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors -- Forwarding an error-like object.
|
9
|
-
image.onerror = event => reject(event);
|
9
|
+
image.onerror = (event) => reject(event);
|
10
10
|
// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors -- Forwarding an error-like object.
|
11
|
-
image.onabort = event => reject(event);
|
11
|
+
image.onabort = (event) => reject(event);
|
12
12
|
});
|
13
13
|
}
|
14
14
|
};
|
@@ -2,7 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
/** Returns a promise that resolves after `timeout` milliseconds. */
|
4
4
|
const waitForTimeout = (timeout) => {
|
5
|
-
return new Promise(resolve => {
|
5
|
+
return new Promise((resolve) => {
|
6
6
|
setTimeout(() => resolve(), timeout);
|
7
7
|
});
|
8
8
|
};
|
package/dist/cjs/version.js
CHANGED
package/dist/mjs/Editor.mjs
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
import EditorImage from './image/EditorImage.mjs';
|
2
2
|
import ToolController from './tools/ToolController.mjs';
|
3
3
|
import { EditorEventType } from './types.mjs';
|
4
|
-
import { InputEvtType, keyUpEventFromHTMLEvent, keyPressEventFromHTMLEvent } from './inputEvents.mjs';
|
4
|
+
import { InputEvtType, keyUpEventFromHTMLEvent, keyPressEventFromHTMLEvent, } from './inputEvents.mjs';
|
5
5
|
import UndoRedoHistory from './UndoRedoHistory.mjs';
|
6
6
|
import Viewport from './Viewport.mjs';
|
7
7
|
import EventDispatcher from './EventDispatcher.mjs';
|
@@ -112,7 +112,7 @@ export class Editor {
|
|
112
112
|
appInfo: settings.appInfo ? { ...settings.appInfo } : null,
|
113
113
|
pens: {
|
114
114
|
additionalPenTypes: settings.pens?.additionalPenTypes ?? [],
|
115
|
-
filterPenTypes: settings.pens?.filterPenTypes ?? (() => true)
|
115
|
+
filterPenTypes: settings.pens?.filterPenTypes ?? (() => true),
|
116
116
|
},
|
117
117
|
text: {
|
118
118
|
fonts: settings.text?.fonts ?? ['sans-serif', 'serif', 'monospace'],
|
@@ -172,7 +172,7 @@ export class Editor {
|
|
172
172
|
this.queueRerender();
|
173
173
|
this.hideLoadingWarning();
|
174
174
|
// Enforce zoom limits.
|
175
|
-
this.notifier.on(EditorEventType.ViewportChanged, evt => {
|
175
|
+
this.notifier.on(EditorEventType.ViewportChanged, (evt) => {
|
176
176
|
if (evt.kind !== EditorEventType.ViewportChanged)
|
177
177
|
return;
|
178
178
|
const getZoom = (mat) => mat.transformVec3(Vec2.unitX).length();
|
@@ -281,16 +281,16 @@ export class Editor {
|
|
281
281
|
this.loadingWarning,
|
282
282
|
];
|
283
283
|
for (const element of preventSelectionOf) {
|
284
|
-
element.addEventListener('drag', event => {
|
284
|
+
element.addEventListener('drag', (event) => {
|
285
285
|
event.preventDefault();
|
286
286
|
return false;
|
287
287
|
});
|
288
|
-
element.addEventListener('dragstart', event => {
|
288
|
+
element.addEventListener('dragstart', (event) => {
|
289
289
|
event.preventDefault();
|
290
290
|
return false;
|
291
291
|
});
|
292
292
|
}
|
293
|
-
this.container.addEventListener('wheel', evt => {
|
293
|
+
this.container.addEventListener('wheel', (evt) => {
|
294
294
|
this.handleHTMLWheelEvent(evt);
|
295
295
|
});
|
296
296
|
const handleResize = () => {
|
@@ -316,7 +316,7 @@ export class Editor {
|
|
316
316
|
}
|
317
317
|
copyHandler.copy(evt);
|
318
318
|
});
|
319
|
-
document.addEventListener('paste', evt => {
|
319
|
+
document.addEventListener('paste', (evt) => {
|
320
320
|
this.handlePaste(evt);
|
321
321
|
});
|
322
322
|
}
|
@@ -371,7 +371,7 @@ export class Editor {
|
|
371
371
|
const res = [];
|
372
372
|
for (const id in this.pointers) {
|
373
373
|
const maxUnupdatedTime = 2000; // Maximum time without a pointer update (ms)
|
374
|
-
if (this.pointers[id] &&
|
374
|
+
if (this.pointers[id] && nowTime - this.pointers[id].timeStamp < maxUnupdatedTime) {
|
375
375
|
res.push(this.pointers[id]);
|
376
376
|
}
|
377
377
|
}
|
@@ -526,10 +526,15 @@ export class Editor {
|
|
526
526
|
evt.preventDefault();
|
527
527
|
};
|
528
528
|
const listeners = {
|
529
|
-
|
530
|
-
|
529
|
+
touchstart: touchstartListener,
|
530
|
+
contextmenu: contextmenuListener,
|
531
531
|
};
|
532
|
-
const eventNames = [
|
532
|
+
const eventNames = [
|
533
|
+
'pointerdown',
|
534
|
+
'pointermove',
|
535
|
+
'pointerup',
|
536
|
+
'pointercancel',
|
537
|
+
];
|
533
538
|
for (const eventName of eventNames) {
|
534
539
|
listeners[eventName] = (evt) => {
|
535
540
|
// This listener will only be called in the context of PointerEvents.
|
@@ -614,8 +619,9 @@ export class Editor {
|
|
614
619
|
// Otherwise, if we received a pointerup/pointercancel without flushing all pointerevents from the
|
615
620
|
// buffer, the gesture wasn't recognised as a stroke. Thus, the editor isn't expecting a pointerup/
|
616
621
|
// pointercancel event.
|
617
|
-
else if ((eventName === 'pointerup' || eventName === 'pointercancel')
|
618
|
-
|
622
|
+
else if ((eventName === 'pointerup' || eventName === 'pointercancel') &&
|
623
|
+
gestureData[pointerId] &&
|
624
|
+
gestureData[pointerId].eventBuffer.length > 0) {
|
619
625
|
this.releasePointerCapture(elem, event.pointerId);
|
620
626
|
// Don't send to the editor.
|
621
627
|
sendToEditor = false;
|
@@ -675,10 +681,10 @@ export class Editor {
|
|
675
681
|
},
|
676
682
|
});
|
677
683
|
// Allow drop.
|
678
|
-
elem.ondragover = evt => {
|
684
|
+
elem.ondragover = (evt) => {
|
679
685
|
evt.preventDefault();
|
680
686
|
};
|
681
|
-
elem.ondrop = evt => {
|
687
|
+
elem.ondrop = (evt) => {
|
682
688
|
this.handleDrop(evt);
|
683
689
|
};
|
684
690
|
this.eventListenerTargets.push(elem);
|
@@ -760,7 +766,7 @@ export class Editor {
|
|
760
766
|
}
|
761
767
|
// Re-render to show progress, but only if we're not done.
|
762
768
|
if (i + updateChunkSize < commands.length) {
|
763
|
-
await new Promise(resolve => {
|
769
|
+
await new Promise((resolve) => {
|
764
770
|
this.rerender();
|
765
771
|
requestAnimationFrame(resolve);
|
766
772
|
});
|
@@ -803,7 +809,7 @@ export class Editor {
|
|
803
809
|
}
|
804
810
|
});
|
805
811
|
}
|
806
|
-
return new Promise(resolve => {
|
812
|
+
return new Promise((resolve) => {
|
807
813
|
this.nextRerenderListeners.push(() => resolve());
|
808
814
|
});
|
809
815
|
}
|
@@ -831,7 +837,7 @@ export class Editor {
|
|
831
837
|
renderer.drawRect(this.getImportExportRect(), exportRectStrokeWidth, exportRectFill);
|
832
838
|
}
|
833
839
|
this.rerenderQueued = false;
|
834
|
-
this.nextRerenderListeners.forEach(listener => listener());
|
840
|
+
this.nextRerenderListeners.forEach((listener) => listener());
|
835
841
|
this.nextRerenderListeners = [];
|
836
842
|
}
|
837
843
|
/**
|
@@ -873,6 +879,7 @@ export class Editor {
|
|
873
879
|
* (e.g. a selection box).
|
874
880
|
*/
|
875
881
|
createHTMLOverlay(overlay) {
|
882
|
+
// TODO(v2): Fix conflict with toolbars that have been added to the editor.
|
876
883
|
overlay.classList.add('overlay', 'js-draw-editor-overlay');
|
877
884
|
this.container.appendChild(overlay);
|
878
885
|
return {
|
@@ -951,7 +958,8 @@ export class Editor {
|
|
951
958
|
const scaleRatioX = visibleRect.width / bbox.width;
|
952
959
|
const scaleRatioY = visibleRect.height / bbox.height;
|
953
960
|
let scaleRatio = scaleRatioX;
|
954
|
-
if (bbox.width * scaleRatio > visibleRect.width ||
|
961
|
+
if (bbox.width * scaleRatio > visibleRect.width ||
|
962
|
+
bbox.height * scaleRatio > visibleRect.height) {
|
955
963
|
scaleRatio = scaleRatioY;
|
956
964
|
}
|
957
965
|
scaleRatio *= 2 / 3;
|
@@ -1106,7 +1114,9 @@ export class Editor {
|
|
1106
1114
|
const originalType = originalBackground?.getBackgroundType?.() ?? BackgroundType.None;
|
1107
1115
|
const originalColor = originalBackground?.getStyle?.().color ?? Color4.transparent;
|
1108
1116
|
const originalFillsScreen = this.image.getAutoresizeEnabled();
|
1109
|
-
const defaultType =
|
1117
|
+
const defaultType = style.color && originalType === BackgroundType.None
|
1118
|
+
? BackgroundType.SolidColor
|
1119
|
+
: originalType;
|
1110
1120
|
const backgroundType = style.type ?? defaultType;
|
1111
1121
|
const backgroundColor = style.color ?? originalColor;
|
1112
1122
|
const fillsScreen = style.autoresize ?? originalFillsScreen;
|
@@ -1134,7 +1144,9 @@ export class Editor {
|
|
1134
1144
|
setBackgroundColor(color) {
|
1135
1145
|
let background = this.getTopmostBackgroundComponent();
|
1136
1146
|
if (!background) {
|
1137
|
-
const backgroundType = color.eq(Color4.transparent)
|
1147
|
+
const backgroundType = color.eq(Color4.transparent)
|
1148
|
+
? BackgroundType.None
|
1149
|
+
: BackgroundType.SolidColor;
|
1138
1150
|
background = new BackgroundComponent(backgroundType, color);
|
1139
1151
|
return this.image.addElement(background);
|
1140
1152
|
}
|
@@ -1221,14 +1233,16 @@ export class Editor {
|
|
1221
1233
|
heading: this.localization.developerInformation,
|
1222
1234
|
text: [
|
1223
1235
|
'Image debug information (from when this dialog was opened):',
|
1224
|
-
` ${this.viewport.getScaleFactor()}x zoom, ${180 / Math.PI * this.viewport.getRotationAngle()}° rotation`,
|
1236
|
+
` ${this.viewport.getScaleFactor()}x zoom, ${(180 / Math.PI) * this.viewport.getRotationAngle()}° rotation`,
|
1225
1237
|
` ${this.image.estimateNumElements()} components`,
|
1226
1238
|
` auto-resize: ${this.image.getAutoresizeEnabled() ? 'enabled' : 'disabled'}`,
|
1227
1239
|
` image size: ${this.getImportExportRect().w}x${this.getImportExportRect().h}`,
|
1228
1240
|
` screen size: ${screenSize.x}x${screenSize.y}`,
|
1229
1241
|
` device pixel ratio: ${this.display.getDevicePixelRatio()}`,
|
1230
1242
|
' cache:',
|
1231
|
-
` ${this.display
|
1243
|
+
` ${this.display
|
1244
|
+
.getCache()
|
1245
|
+
.getDebugInfo()
|
1232
1246
|
// Indent
|
1233
1247
|
.replace(/([\n])/g, '\n ')}`,
|
1234
1248
|
].join('\n'),
|
@@ -49,6 +49,6 @@ export default class EventDispatcher {
|
|
49
49
|
// Replace the current list of listeners with a new, shortened list.
|
50
50
|
// This allows any iterators over this.listeners to continue iterating
|
51
51
|
// without skipping elements.
|
52
|
-
this.listeners[eventName] = listeners.filter(otherCallback => otherCallback !== callback);
|
52
|
+
this.listeners[eventName] = listeners.filter((otherCallback) => otherCallback !== callback);
|
53
53
|
}
|
54
54
|
}
|
package/dist/mjs/Pointer.mjs
CHANGED
@@ -86,9 +86,9 @@ export default class Pointer {
|
|
86
86
|
screenPos = screenPos.minus(Vec2.of(bbox.left, bbox.top));
|
87
87
|
}
|
88
88
|
const pointerTypeToDevice = {
|
89
|
-
|
90
|
-
|
91
|
-
|
89
|
+
mouse: PointerDevice.PrimaryButtonMouse,
|
90
|
+
pen: PointerDevice.Pen,
|
91
|
+
touch: PointerDevice.Touch,
|
92
92
|
};
|
93
93
|
let device = pointerTypeToDevice[evt.pointerType] ?? PointerDevice.Other;
|
94
94
|
const eraserButtonMask = 0x20;
|