js-draw 1.21.3 → 1.23.1
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +104 -76
- 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.d.ts +1 -3
- package/dist/cjs/Editor.js +38 -26
- package/dist/cjs/EventDispatcher.js +1 -1
- package/dist/cjs/Pointer.js +3 -3
- package/dist/cjs/SVGLoader/SVGLoader.js +15 -6
- package/dist/cjs/UndoRedoHistory.js +1 -1
- package/dist/cjs/Viewport.d.ts +1 -1
- package/dist/cjs/Viewport.js +5 -3
- 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 +2 -2
- package/dist/cjs/components/AbstractComponent.js +4 -4
- 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.d.ts +30 -7
- package/dist/cjs/image/EditorImage.js +43 -22
- 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.d.ts +2 -25
- package/dist/cjs/rendering/renderers/CanvasRenderer.js +6 -28
- package/dist/cjs/rendering/renderers/DummyRenderer.js +1 -1
- package/dist/cjs/rendering/renderers/SVGRenderer.js +39 -21
- 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.d.ts +19 -0
- package/dist/cjs/toolbar/AbstractToolbar.js +26 -11
- package/dist/cjs/toolbar/EdgeToolbar.js +11 -15
- package/dist/cjs/toolbar/IconProvider.d.ts +5 -1
- package/dist/cjs/toolbar/IconProvider.js +117 -149
- package/dist/cjs/toolbar/localization.js +5 -5
- 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.d.ts +1 -1
- package/dist/cjs/toolbar/widgets/BaseWidget.js +8 -8
- 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.js +5 -3
- package/dist/cjs/tools/Eraser.js +25 -20
- package/dist/cjs/tools/FindTool.js +2 -2
- package/dist/cjs/tools/InputFilter/ContextMenuRecognizer.js +1 -3
- package/dist/cjs/tools/InputFilter/InputMapper.js +1 -1
- package/dist/cjs/tools/InputFilter/InputPipeline.js +1 -1
- package/dist/cjs/tools/InputFilter/InputStabilizer.js +12 -5
- package/dist/cjs/tools/InputFilter/StrokeKeyboardControl.js +7 -4
- package/dist/cjs/tools/PanZoom.d.ts +1 -1
- package/dist/cjs/tools/PanZoom.js +18 -13
- package/dist/cjs/tools/PasteHandler.js +8 -2
- package/dist/cjs/tools/Pen.d.ts +13 -0
- package/dist/cjs/tools/Pen.js +30 -9
- package/dist/cjs/tools/ScrollbarTool.js +8 -7
- package/dist/cjs/tools/SelectionTool/Selection.js +16 -12
- package/dist/cjs/tools/SelectionTool/SelectionHandle.js +5 -2
- package/dist/cjs/tools/SelectionTool/SelectionMenuShortcut.js +3 -1
- package/dist/cjs/tools/SelectionTool/SelectionTool.js +25 -16
- package/dist/cjs/tools/SelectionTool/ToPointerAutoscroller.js +1 -1
- package/dist/cjs/tools/SelectionTool/TransformMode.js +6 -7
- package/dist/cjs/tools/SelectionTool/util/makeClipboardErrorHandlers.js +23 -2
- package/dist/cjs/tools/SelectionTool/util/showSelectionContextMenu.js +29 -20
- package/dist/cjs/tools/SoundUITool.js +5 -3
- package/dist/cjs/tools/TextTool.js +8 -6
- package/dist/cjs/tools/ToolController.js +16 -10
- package/dist/cjs/tools/lib.d.ts +1 -0
- package/dist/cjs/tools/lib.js +3 -1
- package/dist/cjs/tools/localization.d.ts +2 -0
- package/dist/cjs/tools/localization.js +3 -1
- package/dist/cjs/tools/util/StationaryPenDetector.js +3 -3
- package/dist/cjs/tools/util/createMenuOverlay.js +2 -2
- 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/cloneElementWithStyles.js +1 -1
- package/dist/cjs/util/createElement.d.ts +62 -0
- package/dist/cjs/util/createElement.js +53 -0
- 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.d.ts +1 -3
- package/dist/mjs/Editor.mjs +39 -27
- package/dist/mjs/EventDispatcher.mjs +1 -1
- package/dist/mjs/Pointer.mjs +3 -3
- package/dist/mjs/SVGLoader/SVGLoader.mjs +16 -7
- package/dist/mjs/UndoRedoHistory.mjs +1 -1
- package/dist/mjs/Viewport.d.ts +1 -1
- package/dist/mjs/Viewport.mjs +5 -3
- 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 +2 -2
- package/dist/mjs/components/AbstractComponent.mjs +4 -4
- 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.d.ts +30 -7
- package/dist/mjs/image/EditorImage.mjs +43 -22
- 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.d.ts +2 -25
- package/dist/mjs/rendering/renderers/CanvasRenderer.mjs +6 -28
- package/dist/mjs/rendering/renderers/DummyRenderer.mjs +1 -1
- package/dist/mjs/rendering/renderers/SVGRenderer.mjs +40 -22
- 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.d.ts +19 -0
- package/dist/mjs/toolbar/AbstractToolbar.mjs +26 -11
- package/dist/mjs/toolbar/EdgeToolbar.mjs +11 -15
- package/dist/mjs/toolbar/IconProvider.d.ts +5 -1
- package/dist/mjs/toolbar/IconProvider.mjs +117 -149
- package/dist/mjs/toolbar/localization.mjs +5 -5
- 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.d.ts +1 -1
- package/dist/mjs/toolbar/widgets/BaseWidget.mjs +9 -9
- 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.mjs +6 -4
- package/dist/mjs/tools/Eraser.mjs +25 -20
- package/dist/mjs/tools/FindTool.mjs +2 -2
- package/dist/mjs/tools/InputFilter/ContextMenuRecognizer.mjs +2 -4
- package/dist/mjs/tools/InputFilter/InputMapper.mjs +1 -1
- package/dist/mjs/tools/InputFilter/InputPipeline.mjs +1 -1
- package/dist/mjs/tools/InputFilter/InputStabilizer.mjs +13 -6
- package/dist/mjs/tools/InputFilter/StrokeKeyboardControl.mjs +7 -4
- package/dist/mjs/tools/PanZoom.d.ts +1 -1
- package/dist/mjs/tools/PanZoom.mjs +19 -14
- package/dist/mjs/tools/PasteHandler.mjs +8 -2
- package/dist/mjs/tools/Pen.d.ts +13 -0
- package/dist/mjs/tools/Pen.mjs +31 -10
- package/dist/mjs/tools/ScrollbarTool.mjs +8 -7
- package/dist/mjs/tools/SelectionTool/Selection.mjs +16 -12
- package/dist/mjs/tools/SelectionTool/SelectionHandle.mjs +5 -2
- package/dist/mjs/tools/SelectionTool/SelectionMenuShortcut.mjs +3 -1
- package/dist/mjs/tools/SelectionTool/SelectionTool.mjs +26 -17
- package/dist/mjs/tools/SelectionTool/ToPointerAutoscroller.mjs +1 -1
- package/dist/mjs/tools/SelectionTool/TransformMode.mjs +6 -7
- package/dist/mjs/tools/SelectionTool/util/makeClipboardErrorHandlers.mjs +23 -2
- package/dist/mjs/tools/SelectionTool/util/showSelectionContextMenu.mjs +29 -20
- package/dist/mjs/tools/SoundUITool.mjs +5 -3
- package/dist/mjs/tools/TextTool.mjs +8 -6
- package/dist/mjs/tools/ToolController.mjs +16 -10
- package/dist/mjs/tools/lib.d.ts +1 -0
- package/dist/mjs/tools/lib.mjs +1 -0
- package/dist/mjs/tools/localization.d.ts +2 -0
- package/dist/mjs/tools/localization.mjs +3 -1
- package/dist/mjs/tools/util/StationaryPenDetector.mjs +3 -3
- package/dist/mjs/tools/util/createMenuOverlay.mjs +2 -2
- 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/cloneElementWithStyles.mjs +1 -1
- package/dist/mjs/util/createElement.d.ts +62 -0
- package/dist/mjs/util/createElement.mjs +47 -0
- 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 +1 -2
- package/src/tools/ScrollbarTool.scss +9 -5
- package/src/tools/SelectionTool/SelectionTool.scss +15 -7
- package/src/tools/SelectionTool/util/makeClipboardErrorHandlers.scss +1 -2
- package/src/tools/SoundUITool.scss +4 -4
- package/src/tools/tools.scss +5 -6
- package/src/tools/util/createMenuOverlay.scss +10 -4
- package/tsconfig.json +1 -3
- package/typedoc.json +1 -1
@@ -6,7 +6,7 @@ import CanvasRenderer from '../../rendering/renderers/CanvasRenderer.mjs';
|
|
6
6
|
import SVGRenderer from '../../rendering/renderers/SVGRenderer.mjs';
|
7
7
|
import Selection from './Selection.mjs';
|
8
8
|
import TextComponent from '../../components/TextComponent.mjs';
|
9
|
-
import { duplicateSelectionShortcut, translateLeftSelectionShortcutId, translateRightSelectionShortcutId, selectAllKeyboardShortcut, sendToBackSelectionShortcut, snapToGridKeyboardShortcutId, translateDownSelectionShortcutId, translateUpSelectionShortcutId, rotateClockwiseSelectionShortcutId, rotateCounterClockwiseSelectionShortcutId, stretchXSelectionShortcutId, shrinkXSelectionShortcutId, shrinkYSelectionShortcutId, stretchYSelectionShortcutId, stretchXYSelectionShortcutId, shrinkXYSelectionShortcutId } from '../keybindings.mjs';
|
9
|
+
import { duplicateSelectionShortcut, translateLeftSelectionShortcutId, translateRightSelectionShortcutId, selectAllKeyboardShortcut, sendToBackSelectionShortcut, snapToGridKeyboardShortcutId, translateDownSelectionShortcutId, translateUpSelectionShortcutId, rotateClockwiseSelectionShortcutId, rotateCounterClockwiseSelectionShortcutId, stretchXSelectionShortcutId, shrinkXSelectionShortcutId, shrinkYSelectionShortcutId, stretchYSelectionShortcutId, stretchXYSelectionShortcutId, shrinkXYSelectionShortcutId, } from '../keybindings.mjs';
|
10
10
|
import ToPointerAutoscroller from './ToPointerAutoscroller.mjs';
|
11
11
|
import showSelectionContextMenu from './util/showSelectionContextMenu.mjs';
|
12
12
|
export const cssPrefix = 'selection-tool-';
|
@@ -47,7 +47,7 @@ export default class SelectionTool extends BaseTool {
|
|
47
47
|
editor.createHTMLOverlay(this.handleOverlay);
|
48
48
|
this.handleOverlay.style.display = 'none';
|
49
49
|
this.handleOverlay.classList.add('handleOverlay');
|
50
|
-
editor.notifier.on(EditorEventType.ViewportChanged, _data => {
|
50
|
+
editor.notifier.on(EditorEventType.ViewportChanged, (_data) => {
|
51
51
|
// The selection box could be using the wet ink display if its transformation
|
52
52
|
// hasn't been finalized yet. Clear before updating the UI.
|
53
53
|
this.editor.clearWetInk();
|
@@ -82,7 +82,9 @@ export default class SelectionTool extends BaseTool {
|
|
82
82
|
this.selectionBox.finalizeTransform();
|
83
83
|
}
|
84
84
|
onContextMenu(event) {
|
85
|
-
const canShowSelectionMenu = this.selectionBox
|
85
|
+
const canShowSelectionMenu = this.selectionBox
|
86
|
+
?.getScreenRegion()
|
87
|
+
?.containsPoint(event.screenPos);
|
86
88
|
void this.showContextMenu(event.canvasPos, canShowSelectionMenu);
|
87
89
|
return true;
|
88
90
|
}
|
@@ -196,8 +198,8 @@ export default class SelectionTool extends BaseTool {
|
|
196
198
|
onSelectionUpdated() {
|
197
199
|
const selectedItemCount = this.selectionBox?.getSelectedItemCount() ?? 0;
|
198
200
|
const selectedObjects = this.selectionBox?.getSelectedObjects() ?? [];
|
199
|
-
const hasDifferentSelection = this.lastSelectedObjects.length !== selectedItemCount
|
200
|
-
|
201
|
+
const hasDifferentSelection = this.lastSelectedObjects.length !== selectedItemCount ||
|
202
|
+
selectedObjects.some((obj, i) => this.lastSelectedObjects[i] !== obj);
|
201
203
|
if (hasDifferentSelection) {
|
202
204
|
this.lastSelectedObjects = selectedObjects;
|
203
205
|
// Note that the selection has changed
|
@@ -234,8 +236,9 @@ export default class SelectionTool extends BaseTool {
|
|
234
236
|
this.snapToGrid = true;
|
235
237
|
return true;
|
236
238
|
}
|
237
|
-
if (this.selectionBox &&
|
238
|
-
|
239
|
+
if (this.selectionBox &&
|
240
|
+
(shortcucts.matchesShortcut(duplicateSelectionShortcut, event) ||
|
241
|
+
shortcucts.matchesShortcut(sendToBackSelectionShortcut, event))) {
|
239
242
|
// Handle duplication on key up — we don't want to accidentally duplicate
|
240
243
|
// many times.
|
241
244
|
return true;
|
@@ -298,11 +301,11 @@ export default class SelectionTool extends BaseTool {
|
|
298
301
|
xScaleSteps += 1;
|
299
302
|
yScaleSteps += 1;
|
300
303
|
}
|
301
|
-
let handled = xTranslateSteps !== 0
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
304
|
+
let handled = xTranslateSteps !== 0 ||
|
305
|
+
yTranslateSteps !== 0 ||
|
306
|
+
rotationSteps !== 0 ||
|
307
|
+
xScaleSteps !== 0 ||
|
308
|
+
yScaleSteps !== 0;
|
306
309
|
if (!this.selectionBox) {
|
307
310
|
handled = false;
|
308
311
|
}
|
@@ -313,9 +316,13 @@ export default class SelectionTool extends BaseTool {
|
|
313
316
|
const region = this.selectionBox.region;
|
314
317
|
const scaleFactor = Vec2.of(scaleStepSize ** xScaleSteps, scaleStepSize ** yScaleSteps);
|
315
318
|
const rotationMat = Mat33.zRotation(rotationSteps * rotateStepSize);
|
316
|
-
const roundedRotationMatrix = rotationMat.mapEntries(component => Viewport.roundScaleRatio(component));
|
319
|
+
const roundedRotationMatrix = rotationMat.mapEntries((component) => Viewport.roundScaleRatio(component));
|
317
320
|
const regionCenter = this.editor.viewport.roundPoint(region.center);
|
318
|
-
const transform = Mat33.scaling2D(scaleFactor, this.editor.viewport.roundPoint(region.topLeft))
|
321
|
+
const transform = Mat33.scaling2D(scaleFactor, this.editor.viewport.roundPoint(region.topLeft))
|
322
|
+
.rightMul(Mat33.translation(regionCenter)
|
323
|
+
.rightMul(roundedRotationMatrix)
|
324
|
+
.rightMul(Mat33.translation(regionCenter.times(-1))))
|
325
|
+
.rightMul(Mat33.translation(this.editor.viewport.roundPoint(Vec2.of(xTranslateSteps, yTranslateSteps).times(translateStepSize))));
|
319
326
|
const oldTransform = this.selectionBox.getTransform();
|
320
327
|
this.selectionBox.setTransform(oldTransform.rightMul(transform));
|
321
328
|
this.selectionBox.scrollTo();
|
@@ -341,7 +348,7 @@ export default class SelectionTool extends BaseTool {
|
|
341
348
|
}
|
342
349
|
if (this.selectionBox && shortcucts.matchesShortcut(duplicateSelectionShortcut, evt)) {
|
343
350
|
// Finalize duplicating the selection
|
344
|
-
this.selectionBox.duplicateSelectedObjects().then(command => {
|
351
|
+
this.selectionBox.duplicateSelectedObjects().then((command) => {
|
345
352
|
this.editor.dispatch(command);
|
346
353
|
});
|
347
354
|
return true;
|
@@ -386,7 +393,9 @@ export default class SelectionTool extends BaseTool {
|
|
386
393
|
return false;
|
387
394
|
}
|
388
395
|
const exportViewport = new Viewport(() => { });
|
389
|
-
const selectionScreenSize = this.selectionBox
|
396
|
+
const selectionScreenSize = this.selectionBox
|
397
|
+
.getScreenRegion()
|
398
|
+
.size.times(this.editor.display.getDevicePixelRatio());
|
390
399
|
// Update the viewport to have screen size roughly equal to the size of the selection box
|
391
400
|
let scaleFactor = selectionScreenSize.maximumEntryMagnitude() / (bbox.size.maximumEntryMagnitude() || 1);
|
392
401
|
// Round to a nearby power of two
|
@@ -455,7 +464,7 @@ export default class SelectionTool extends BaseTool {
|
|
455
464
|
// Select the given `objects`. Any non-selectable objects in `objects` are ignored.
|
456
465
|
setSelection(objects) {
|
457
466
|
// Only select selectable objects.
|
458
|
-
objects = objects.filter(obj => obj.isSelectable());
|
467
|
+
objects = objects.filter((obj) => obj.isSelectable());
|
459
468
|
// Sort by z-index
|
460
469
|
objects.sort((a, b) => a.getZIndex() - b.getZIndex());
|
461
470
|
// Remove duplicates
|
@@ -63,7 +63,7 @@ export default class ToPointerAutoscroller {
|
|
63
63
|
const currentTime = performance.now();
|
64
64
|
const deltaTimeMs = currentTime - lastUpdateTime;
|
65
65
|
const scrollDirection = this.getScrollForPoint(this.targetPoint);
|
66
|
-
const screenScrollAmount = scrollDirection.times(this.scrollRate * deltaTimeMs / 1000);
|
66
|
+
const screenScrollAmount = scrollDirection.times((this.scrollRate * deltaTimeMs) / 1000);
|
67
67
|
this.scrollByCanvasDelta(this.viewport.screenToCanvasTransform.transformVec3(screenScrollAmount));
|
68
68
|
lastUpdateTime = currentTime;
|
69
69
|
await untilNextAnimationFrame();
|
@@ -75,7 +75,7 @@ export class ResizeTransformer {
|
|
75
75
|
}
|
76
76
|
// Round: If this isn't done, scaling can create numbers with long decimal representations.
|
77
77
|
// long decimal representations => large file sizes.
|
78
|
-
scale = scale.map(component => Viewport.roundScaleRatio(component, 2));
|
78
|
+
scale = scale.map((component) => Viewport.roundScaleRatio(component, 2));
|
79
79
|
if (scale.x !== 0 && scale.y !== 0) {
|
80
80
|
const origin = this.editor.viewport.roundPoint(this.transformOrigin);
|
81
81
|
this.selection.setTransform(Mat33.scaling2D(scale, origin));
|
@@ -116,9 +116,8 @@ export class RotateTransformer {
|
|
116
116
|
// Transform in canvas space
|
117
117
|
const canvasSelCenter = this.editor.viewport.roundPoint(this.selection.preTransformRegion.center);
|
118
118
|
const unrounded = Mat33.zRotation(angle);
|
119
|
-
const roundedRotationTransform = unrounded.mapEntries(entry => Viewport.roundScaleRatio(entry));
|
120
|
-
const fullRoundedTransform = Mat33
|
121
|
-
.translation(canvasSelCenter)
|
119
|
+
const roundedRotationTransform = unrounded.mapEntries((entry) => Viewport.roundScaleRatio(entry));
|
120
|
+
const fullRoundedTransform = Mat33.translation(canvasSelCenter)
|
122
121
|
.rightMul(roundedRotationTransform)
|
123
122
|
.rightMul(Mat33.translation(canvasSelCenter.times(-1)));
|
124
123
|
this.selection.setTransform(fullRoundedTransform);
|
@@ -136,9 +135,9 @@ export class RotateTransformer {
|
|
136
135
|
const clickThresholdDist = 10;
|
137
136
|
const clickThresholdTime = 0.4; // s
|
138
137
|
const dragTimeSeconds = (performance.now() - this.startTime) / 1000;
|
139
|
-
if (dragTimeSeconds < clickThresholdTime
|
140
|
-
|
141
|
-
|
138
|
+
if (dragTimeSeconds < clickThresholdTime &&
|
139
|
+
this.maximumDistFromStart < clickThresholdDist &&
|
140
|
+
this.targetRotation === 0) {
|
142
141
|
this.setRotationTo(-Math.PI / 2);
|
143
142
|
}
|
144
143
|
return this.selection.finalizeTransform();
|
@@ -4,7 +4,7 @@ const makeClipboardErrorHandlers = (editor) => {
|
|
4
4
|
const makeErrorDialog = (error) => {
|
5
5
|
const dialog = makeMessageDialog(editor, {
|
6
6
|
title: editor.localization.copyPasteError__heading,
|
7
|
-
classNames: ['clipboard-error-dialog']
|
7
|
+
classNames: ['clipboard-error-dialog'],
|
8
8
|
});
|
9
9
|
dialog.appendChild(document.createTextNode(editor.localization.copyPasteError__description));
|
10
10
|
const errorDetailsElement = document.createElement('details');
|
@@ -17,7 +17,26 @@ const makeClipboardErrorHandlers = (editor) => {
|
|
17
17
|
};
|
18
18
|
return {
|
19
19
|
async onCopyError(error) {
|
20
|
-
makeErrorDialog(error);
|
20
|
+
const dialog = makeErrorDialog(error);
|
21
|
+
const textboxLabel = document.createElement('label');
|
22
|
+
textboxLabel.textContent = editor.localization.copyPasteError__copyRetry;
|
23
|
+
const copyTextbox = document.createElement('textarea');
|
24
|
+
textboxLabel.appendChild(copyTextbox);
|
25
|
+
const retryHandler = new ClipboardHandler(editor);
|
26
|
+
const handleCopy = (event) => {
|
27
|
+
event.preventDefault();
|
28
|
+
// Use .then to ensure that .copy runs within the event handler.
|
29
|
+
// Copy can fail if certain logic is run async.
|
30
|
+
return retryHandler.copy(event).then(() => {
|
31
|
+
dialog.close();
|
32
|
+
});
|
33
|
+
};
|
34
|
+
copyTextbox.oncopy = handleCopy;
|
35
|
+
copyTextbox.ondragstart = handleCopy;
|
36
|
+
copyTextbox.value = editor.localization.copyPasteError__copyMe;
|
37
|
+
dialog.appendChild(textboxLabel);
|
38
|
+
copyTextbox.select();
|
39
|
+
document.execCommand('copy');
|
21
40
|
},
|
22
41
|
onPasteError(error) {
|
23
42
|
const dialog = makeErrorDialog(error);
|
@@ -39,6 +58,8 @@ const makeClipboardErrorHandlers = (editor) => {
|
|
39
58
|
pasteTextbox.onpaste = handlePaste;
|
40
59
|
pasteTextbox.ondrop = handlePaste;
|
41
60
|
dialog.appendChild(textboxLabel);
|
61
|
+
pasteTextbox.focus();
|
62
|
+
document.execCommand('paste');
|
42
63
|
},
|
43
64
|
};
|
44
65
|
};
|
@@ -4,35 +4,44 @@ import makeClipboardErrorHandlers from './makeClipboardErrorHandlers.mjs';
|
|
4
4
|
const showSelectionContextMenu = async (selectionBox, editor, canvasAnchor, preferSelectionMenu, clearSelection) => {
|
5
5
|
const localization = editor.localization;
|
6
6
|
const showSelectionMenu = selectionBox?.getSelectedItemCount() && preferSelectionMenu;
|
7
|
-
const noSelectionMenu = [
|
7
|
+
const noSelectionMenu = [
|
8
|
+
{
|
8
9
|
text: localization.selectionMenu__paste,
|
9
10
|
icon: () => editor.icons.makePasteIcon(),
|
10
11
|
key: () => {
|
11
12
|
const clipboardHandler = new ClipboardHandler(editor, makeClipboardErrorHandlers(editor));
|
12
13
|
void clipboardHandler.paste();
|
13
14
|
},
|
14
|
-
}
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
15
|
+
},
|
16
|
+
];
|
17
|
+
const onActivated = await createMenuOverlay(editor, canvasAnchor, showSelectionMenu
|
18
|
+
? [
|
19
|
+
{
|
20
|
+
text: localization.selectionMenu__duplicate,
|
21
|
+
icon: () => editor.icons.makeDuplicateSelectionIcon(),
|
22
|
+
key: async () => {
|
23
|
+
await editor.dispatch(await selectionBox.duplicateSelectedObjects());
|
24
|
+
},
|
20
25
|
},
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
26
|
+
{
|
27
|
+
text: localization.selectionMenu__delete,
|
28
|
+
icon: () => editor.icons.makeDeleteSelectionIcon(),
|
29
|
+
key: async () => {
|
30
|
+
await editor.dispatch(selectionBox.deleteSelectedObjects());
|
31
|
+
clearSelection();
|
32
|
+
},
|
27
33
|
},
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
+
{
|
35
|
+
text: localization.selectionMenu__copyToClipboard,
|
36
|
+
icon: () => editor.icons.makeCopyIcon(),
|
37
|
+
key: () => {
|
38
|
+
const clipboardHandler = new ClipboardHandler(editor, makeClipboardErrorHandlers(editor));
|
39
|
+
void clipboardHandler.copy();
|
40
|
+
},
|
34
41
|
},
|
35
|
-
|
42
|
+
...noSelectionMenu,
|
43
|
+
]
|
44
|
+
: noSelectionMenu);
|
36
45
|
onActivated?.();
|
37
46
|
};
|
38
47
|
export default showSelectionContextMenu;
|
@@ -53,12 +53,12 @@ class SoundFeedback {
|
|
53
53
|
setColor(color) {
|
54
54
|
const hsv = color.asHSV();
|
55
55
|
// Choose frequencies that roughly correspond to hue, saturation, and value.
|
56
|
-
const hueFrequency =
|
56
|
+
const hueFrequency = -Math.cos(hsv.x / 2) * 220 + 440;
|
57
57
|
const saturationFrequency = hsv.y * 440 + 220;
|
58
58
|
const valueFrequency = (hsv.z + 0.1) * 440;
|
59
59
|
// Sigmoid with maximum 0.25 * alpha.
|
60
60
|
// Louder for greater value.
|
61
|
-
const gain = 0.25 * Math.min(1, color.a) / (1 + Math.exp(-(hsv.z - 0.5) * 3));
|
61
|
+
const gain = (0.25 * Math.min(1, color.a)) / (1 + Math.exp(-(hsv.z - 0.5) * 3));
|
62
62
|
this.colorOscHue.frequency.setValueAtTime(hueFrequency, this.ctx.currentTime);
|
63
63
|
this.colorOscSaturation.frequency.setValueAtTime(saturationFrequency, this.ctx.currentTime);
|
64
64
|
this.colorOscValue.frequency.setValueAtTime(valueFrequency, this.ctx.currentTime);
|
@@ -150,7 +150,9 @@ export default class SoundUITool extends BaseTool {
|
|
150
150
|
onPointerMove({ current }) {
|
151
151
|
this.soundFeedback?.setColor(this.editor.display.getColorAt(current.screenPos) ?? Color4.black);
|
152
152
|
const pointerMotionLine = new LineSegment2(this.lastPointerPos, current.canvasPos);
|
153
|
-
const collisions = this.editor.image
|
153
|
+
const collisions = this.editor.image
|
154
|
+
.getElementsIntersectingRegion(pointerMotionLine.bbox)
|
155
|
+
.filter((component) => component.intersects(pointerMotionLine));
|
154
156
|
this.lastPointerPos = current.canvasPos;
|
155
157
|
if (collisions.length > 0) {
|
156
158
|
this.soundFeedback?.announceBoundaryCross(collisions.length);
|
@@ -76,7 +76,7 @@ export default class TextTool extends BaseTool {
|
|
76
76
|
return measurement.fontBoundingBoxAscent ?? measurement.actualBoundingBoxAscent;
|
77
77
|
}
|
78
78
|
// Estimate
|
79
|
-
return style.size * 2 / 3;
|
79
|
+
return (style.size * 2) / 3;
|
80
80
|
}
|
81
81
|
// Take input from this' textInputElem and add it to the EditorImage.
|
82
82
|
// If [removeInput], the HTML input element is removed. Otherwise, its value
|
@@ -95,7 +95,10 @@ export default class TextTool extends BaseTool {
|
|
95
95
|
if (content === '') {
|
96
96
|
return;
|
97
97
|
}
|
98
|
-
const textTransform = Mat33.translation(this.textTargetPosition)
|
98
|
+
const textTransform = Mat33.translation(this.textTargetPosition)
|
99
|
+
.rightMul(this.getTextScaleMatrix())
|
100
|
+
.rightMul(Mat33.scaling2D(this.editor.viewport.getSizeOfPixelOnCanvas()))
|
101
|
+
.rightMul(Mat33.zRotation(this.textRotation));
|
99
102
|
const textComponent = TextComponent.fromLines(content.split('\n'), textTransform, this.textStyle);
|
100
103
|
const action = EditorImage.addElement(textComponent);
|
101
104
|
if (this.removeExistingCommand) {
|
@@ -139,8 +142,7 @@ export default class TextTool extends BaseTool {
|
|
139
142
|
const vertAdjust = ascent;
|
140
143
|
const rotation = this.textRotation + viewport.getRotationAngle();
|
141
144
|
const scale = this.getTextScaleMatrix();
|
142
|
-
this.textInputElem.style.transform =
|
143
|
-
`${scale.toCSSMatrix()} rotate(${rotation * 180 / Math.PI}deg) translate(0, ${-vertAdjust}px)`;
|
145
|
+
this.textInputElem.style.transform = `${scale.toCSSMatrix()} rotate(${(rotation * 180) / Math.PI}deg) translate(0, ${-vertAdjust}px)`;
|
144
146
|
this.textInputElem.style.transformOrigin = 'top left';
|
145
147
|
// Match the line height of default rendered text.
|
146
148
|
const lineHeight = Math.floor(this.textStyle.size);
|
@@ -208,11 +210,11 @@ export default class TextTool extends BaseTool {
|
|
208
210
|
const halfTestRegionSize = Vec2.of(2.5, 2.5).times(this.editor.viewport.getSizeOfPixelOnCanvas());
|
209
211
|
const testRegion = Rect2.fromCorners(canvasPos.minus(halfTestRegionSize), canvasPos.plus(halfTestRegionSize));
|
210
212
|
const targetNodes = this.editor.image.getElementsIntersectingRegion(testRegion);
|
211
|
-
let targetTextNodes = targetNodes.filter(node => node instanceof TextComponent);
|
213
|
+
let targetTextNodes = targetNodes.filter((node) => node instanceof TextComponent);
|
212
214
|
// Don't try to edit text nodes that contain the viewport (this allows us
|
213
215
|
// to zoom in on text nodes and add text on top of them.)
|
214
216
|
const visibleRect = this.editor.viewport.visibleRect;
|
215
|
-
targetTextNodes = targetTextNodes.filter(node => !node.getBBox().containsRect(visibleRect));
|
217
|
+
targetTextNodes = targetTextNodes.filter((node) => !node.getBBox().containsRect(visibleRect));
|
216
218
|
// End any TextNodes we're currently editing.
|
217
219
|
this.flushInput();
|
218
220
|
if (targetTextNodes.length > 0) {
|
@@ -25,13 +25,19 @@ export default class ToolController {
|
|
25
25
|
this.activeTool = null;
|
26
26
|
this.isEditorReadOnly = editor.isReadOnlyReactiveValue();
|
27
27
|
this.inputPipeline = new InputPipeline();
|
28
|
-
this.inputPipeline.setEmitListener(event => this.onEventInternal(event));
|
28
|
+
this.inputPipeline.setEmitListener((event) => this.onEventInternal(event));
|
29
29
|
const primaryToolGroup = new ToolEnabledGroup();
|
30
30
|
this.primaryToolGroup = primaryToolGroup;
|
31
31
|
const panZoomTool = new PanZoom(editor, PanZoomMode.TwoFingerTouchGestures | PanZoomMode.RightClickDrags, localization.touchPanTool);
|
32
32
|
const keyboardPanZoomTool = new PanZoom(editor, PanZoomMode.Keyboard, localization.keyboardPanZoom);
|
33
|
-
const primaryPenTool = new Pen(editor, localization.penTool(1), {
|
34
|
-
|
33
|
+
const primaryPenTool = new Pen(editor, localization.penTool(1), {
|
34
|
+
color: Color4.purple,
|
35
|
+
thickness: 8,
|
36
|
+
});
|
37
|
+
const secondaryPenTool = new Pen(editor, localization.penTool(2), {
|
38
|
+
color: Color4.clay,
|
39
|
+
thickness: 4,
|
40
|
+
});
|
35
41
|
// Stabilize the secondary pen tool.
|
36
42
|
secondaryPenTool.setInputMapper(new InputStabilizer(editor.viewport));
|
37
43
|
const eraser = new Eraser(editor, localization.eraserTool);
|
@@ -43,7 +49,7 @@ export default class ToolController {
|
|
43
49
|
new Pen(editor, localization.penTool(3), {
|
44
50
|
color: Color4.ofRGBA(1, 1, 0, 0.5),
|
45
51
|
thickness: 40,
|
46
|
-
factory: makePressureSensitiveFreehandLineBuilder
|
52
|
+
factory: makePressureSensitiveFreehandLineBuilder,
|
47
53
|
}),
|
48
54
|
eraser,
|
49
55
|
new SelectionTool(editor, localization.selectionTool),
|
@@ -68,15 +74,15 @@ export default class ToolController {
|
|
68
74
|
new PasteHandler(editor),
|
69
75
|
new SelectAllShortcutHandler(editor),
|
70
76
|
];
|
71
|
-
primaryTools.forEach(tool => tool.setToolGroup(primaryToolGroup));
|
77
|
+
primaryTools.forEach((tool) => tool.setToolGroup(primaryToolGroup));
|
72
78
|
panZoomTool.setEnabled(true);
|
73
79
|
primaryPenTool.setEnabled(true);
|
74
|
-
editor.notifier.on(EditorEventType.ToolEnabled, event => {
|
80
|
+
editor.notifier.on(EditorEventType.ToolEnabled, (event) => {
|
75
81
|
if (event.kind === EditorEventType.ToolEnabled) {
|
76
82
|
editor.announceForAccessibility(localization.toolEnabledAnnouncement(event.tool.description));
|
77
83
|
}
|
78
84
|
});
|
79
|
-
editor.notifier.on(EditorEventType.ToolDisabled, event => {
|
85
|
+
editor.notifier.on(EditorEventType.ToolDisabled, (event) => {
|
80
86
|
if (event.kind === EditorEventType.ToolDisabled) {
|
81
87
|
editor.announceForAccessibility(localization.toolDisabledAnnouncement(event.tool.description));
|
82
88
|
}
|
@@ -110,7 +116,7 @@ export default class ToolController {
|
|
110
116
|
}
|
111
117
|
}
|
112
118
|
getPrimaryTools() {
|
113
|
-
return this.tools.filter(tool => {
|
119
|
+
return this.tools.filter((tool) => {
|
114
120
|
return tool.getToolGroup() === this.primaryToolGroup;
|
115
121
|
});
|
116
122
|
}
|
@@ -152,7 +158,7 @@ export default class ToolController {
|
|
152
158
|
this.tools = newTools;
|
153
159
|
}
|
154
160
|
insertTools(insertNear, toolsToInsert, mode) {
|
155
|
-
this.tools = this.tools.filter(tool => !toolsToInsert.includes(tool));
|
161
|
+
this.tools = this.tools.filter((tool) => !toolsToInsert.includes(tool));
|
156
162
|
const newTools = [];
|
157
163
|
for (const tool of this.tools) {
|
158
164
|
if (mode === 'after') {
|
@@ -264,7 +270,7 @@ export default class ToolController {
|
|
264
270
|
this.inputPipeline.addToTail(mapper);
|
265
271
|
}
|
266
272
|
getMatchingTools(type) {
|
267
|
-
return this.tools.filter(tool => tool instanceof type);
|
273
|
+
return this.tools.filter((tool) => tool instanceof type);
|
268
274
|
}
|
269
275
|
// @internal
|
270
276
|
onEditorDestroyed() {
|
package/dist/mjs/tools/lib.d.ts
CHANGED
package/dist/mjs/tools/lib.mjs
CHANGED
@@ -36,6 +36,8 @@ export interface ToolLocalization {
|
|
36
36
|
copyPasteError__heading: string;
|
37
37
|
copyPasteError__description: string;
|
38
38
|
copyPasteError__pasteRetry: string;
|
39
|
+
copyPasteError__copyRetry: string;
|
40
|
+
copyPasteError__copyMe: string;
|
39
41
|
copyPasteError__errorDetails: string;
|
40
42
|
toolEnabledAnnouncement: (toolName: string) => string;
|
41
43
|
toolDisabledAnnouncement: (toolName: string) => string;
|
@@ -14,10 +14,12 @@ export const defaultToolLocalization = {
|
|
14
14
|
selectionMenu__duplicate: 'Duplicate',
|
15
15
|
selectionMenu__delete: 'Delete',
|
16
16
|
selectionMenu__paste: 'Paste',
|
17
|
-
copyPasteError__heading: '
|
17
|
+
copyPasteError__heading: 'Copy/paste',
|
18
18
|
copyPasteError__description: 'Something went wrong — this tool may not have clipboard access.',
|
19
19
|
copyPasteError__errorDetails: 'Show error',
|
20
20
|
copyPasteError__pasteRetry: 'To retry, please paste into the input box below:',
|
21
|
+
copyPasteError__copyRetry: 'To retry, please copy the text in the input box below:',
|
22
|
+
copyPasteError__copyMe: 'Copy me!',
|
21
23
|
autocorrectedTo: (strokeDescription) => `Autocorrected to ${strokeDescription}`,
|
22
24
|
autocorrectionCanceled: 'Autocorrect cancelled',
|
23
25
|
textTool: 'Text',
|
@@ -45,9 +45,9 @@ export default class StationaryPenDetector {
|
|
45
45
|
const movedOutOfRadius = dxFromStationaryStart.length() > this.config.maxRadius;
|
46
46
|
this.hasMovedOutOfRadius ||= movedOutOfRadius;
|
47
47
|
// If not stationary
|
48
|
-
if (movedOutOfRadius
|
49
|
-
|
50
|
-
|
48
|
+
if (movedOutOfRadius ||
|
49
|
+
this.averageVelocity.length() > this.config.maxSpeed ||
|
50
|
+
dtFromStart < this.config.minTimeSeconds) {
|
51
51
|
this.stationaryStartPointer = currentPointer;
|
52
52
|
this.lastPointer = currentPointer;
|
53
53
|
this.setStationaryTimeout(this.config.minTimeSeconds * 1000);
|
@@ -27,7 +27,7 @@ const createMenuOverlay = async (editor, canvasAnchor, options) => {
|
|
27
27
|
await waitForTimeout(hideMenuTimeout);
|
28
28
|
menuModal.close();
|
29
29
|
};
|
30
|
-
return new Promise(resolve => {
|
30
|
+
return new Promise((resolve) => {
|
31
31
|
let resolved = false;
|
32
32
|
let result = null;
|
33
33
|
const resolveWithSelectedResult = () => {
|
@@ -70,7 +70,7 @@ const createMenuOverlay = async (editor, canvasAnchor, options) => {
|
|
70
70
|
// - https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/menu_role and
|
71
71
|
// - https://www.w3.org/WAI/ARIA/apg/patterns/disclosure/examples/disclosure-navigation/
|
72
72
|
contentElement.addEventListener('keydown', (event) => {
|
73
|
-
const focusedIndex = optionElements.findIndex(item => item === document.activeElement);
|
73
|
+
const focusedIndex = optionElements.findIndex((item) => item === document.activeElement);
|
74
74
|
if (focusedIndex === -1)
|
75
75
|
return;
|
76
76
|
let newFocusedIndex = focusedIndex;
|
@@ -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 {};
|
@@ -58,20 +58,15 @@ class ClipboardHandler {
|
|
58
58
|
const clipboardData = event?.dataTransfer ?? event?.clipboardData ?? null;
|
59
59
|
const hasEvent = !!clipboardData;
|
60
60
|
const sendPasteEvent = (mime, data) => {
|
61
|
-
return data &&
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
61
|
+
return (data &&
|
62
|
+
editor.toolController.dispatchInputEvent({
|
63
|
+
kind: InputEvtType.PasteEvent,
|
64
|
+
mime,
|
65
|
+
data,
|
66
|
+
}));
|
66
67
|
};
|
67
68
|
// Listed in order of precedence
|
68
|
-
const supportedMIMEs = [
|
69
|
-
'image/svg+xml',
|
70
|
-
'text/html',
|
71
|
-
'image/png',
|
72
|
-
'image/jpeg',
|
73
|
-
'text/plain',
|
74
|
-
];
|
69
|
+
const supportedMIMEs = ['image/svg+xml', 'text/html', 'image/png', 'image/jpeg', 'text/plain'];
|
75
70
|
let files = [];
|
76
71
|
const textData = new Map();
|
77
72
|
if (hasEvent) {
|
@@ -105,7 +100,7 @@ class ClipboardHandler {
|
|
105
100
|
}
|
106
101
|
}
|
107
102
|
for (const file of files) {
|
108
|
-
const fileType = file
|
103
|
+
const fileType = file?.type?.toLowerCase();
|
109
104
|
if (fileType !== mime) {
|
110
105
|
continue;
|
111
106
|
}
|
@@ -181,14 +176,19 @@ class ClipboardHandler {
|
|
181
176
|
event?.preventDefault();
|
182
177
|
}
|
183
178
|
const mimeTypes = [...mimeToData.keys()];
|
184
|
-
const hasNonTextMimeTypes = mimeTypes.some(mime => !isTextMimeType(mime));
|
179
|
+
const hasNonTextMimeTypes = mimeTypes.some((mime) => !isTextMimeType(mime));
|
185
180
|
const copyToEvent = (reason) => {
|
186
181
|
if (!event) {
|
187
182
|
throw new Error(`Unable to copy -- no event provided${reason ? `. Original error: ${reason}` : ''}`);
|
188
183
|
}
|
189
184
|
for (const [key, value] of mimeToData.entries()) {
|
190
185
|
if (typeof value === 'string') {
|
191
|
-
|
186
|
+
if ('clipboardData' in event) {
|
187
|
+
event.clipboardData?.setData(key, value);
|
188
|
+
}
|
189
|
+
else {
|
190
|
+
event.dataTransfer?.setData(key, value);
|
191
|
+
}
|
192
192
|
}
|
193
193
|
}
|
194
194
|
};
|
@@ -219,7 +219,9 @@ class ClipboardHandler {
|
|
219
219
|
// Browser support for ClipboardItem.supports is limited as of mid 2024. However, some browsers
|
220
220
|
// that do support `.supports` throw an exception when attempting to copy an unsupported MIME type
|
221
221
|
// (e.g. Firefox).
|
222
|
-
const unsupported = 'supports' in ClipboardItem &&
|
222
|
+
const unsupported = 'supports' in ClipboardItem &&
|
223
|
+
typeof ClipboardItem.supports === 'function' &&
|
224
|
+
!ClipboardItem.supports(key);
|
223
225
|
if (!unsupported) {
|
224
226
|
filteredMimeToData[key] = data;
|
225
227
|
}
|
@@ -229,8 +231,7 @@ class ClipboardHandler {
|
|
229
231
|
const browserMimeToData = removeUnsupportedMime(mapInternalDataToBrowserData(mimeToData));
|
230
232
|
return navigator.clipboard.write([new ClipboardItem(browserMimeToData)]);
|
231
233
|
};
|
232
|
-
const supportsClipboardApi =
|
233
|
-
&& typeof navigator?.clipboard?.write !== 'undefined');
|
234
|
+
const supportsClipboardApi = typeof ClipboardItem !== 'undefined' && typeof navigator?.clipboard?.write !== 'undefined';
|
234
235
|
if (!__classPrivateFieldGet(this, _ClipboardHandler_preferClipboardEvents, "f") && supportsClipboardApi && (hasNonTextMimeTypes || !event)) {
|
235
236
|
let clipboardApiPromise = null;
|
236
237
|
const fallBackToCopyEvent = (reason) => {
|