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
@@ -69,7 +69,7 @@ class HandModeWidget extends BaseWidget {
|
|
69
69
|
this.makeIcon = makeIcon;
|
70
70
|
this.title = title;
|
71
71
|
this.helpText = helpText;
|
72
|
-
editor.notifier.on(EditorEventType.ToolUpdated, toolEvt => {
|
72
|
+
editor.notifier.on(EditorEventType.ToolUpdated, (toolEvt) => {
|
73
73
|
if (toolEvt.kind === EditorEventType.ToolUpdated && toolEvt.tool === tool) {
|
74
74
|
const allEnabled = !!(tool.getMode() & PanZoomMode.SinglePointerGestures);
|
75
75
|
this.setSelected(!!(tool.getMode() & flag) || allEnabled);
|
@@ -112,12 +112,12 @@ export default class HandToolWidget extends BaseToolWidget {
|
|
112
112
|
// If the primary, the override will be gotten from the editor's tool controller.
|
113
113
|
tool, localizationTable) {
|
114
114
|
const isGivenToolPrimary = editor.toolController.getPrimaryTools().includes(tool);
|
115
|
-
const primaryTool = (isGivenToolPrimary ? tool : HandToolWidget.getPrimaryHandTool(editor.toolController))
|
116
|
-
|
115
|
+
const primaryTool = (isGivenToolPrimary ? tool : HandToolWidget.getPrimaryHandTool(editor.toolController)) ??
|
116
|
+
tool;
|
117
117
|
super(editor, primaryTool, 'hand-tool-widget', localizationTable);
|
118
118
|
this.overridePanZoomTool =
|
119
|
-
(isGivenToolPrimary ? HandToolWidget.getOverrideHandTool(editor.toolController) : tool)
|
120
|
-
|
119
|
+
(isGivenToolPrimary ? HandToolWidget.getOverrideHandTool(editor.toolController) : tool) ??
|
120
|
+
tool;
|
121
121
|
// Only allow toggling a hand tool if we're using the primary hand tool and not the override
|
122
122
|
// hand tool for this button.
|
123
123
|
this.allowTogglingBaseTool = primaryTool !== null;
|
@@ -132,7 +132,9 @@ export default class HandToolWidget extends BaseToolWidget {
|
|
132
132
|
this.addSubWidget(rotationLockWidget);
|
133
133
|
}
|
134
134
|
static getPrimaryHandTool(toolController) {
|
135
|
-
const primaryPanZoomToolList = toolController
|
135
|
+
const primaryPanZoomToolList = toolController
|
136
|
+
.getPrimaryTools()
|
137
|
+
.filter((tool) => tool instanceof PanZoom);
|
136
138
|
const primaryPanZoomTool = primaryPanZoomToolList[0];
|
137
139
|
return primaryPanZoomTool;
|
138
140
|
}
|
@@ -34,7 +34,7 @@ class InsertImageWidget extends BaseWidget {
|
|
34
34
|
super(editor, 'insert-image-widget', localization);
|
35
35
|
// Make the dropdown showable
|
36
36
|
this.container.classList.add('dropdownShowable');
|
37
|
-
editor.notifier.on(EditorEventType.SelectionUpdated, event => {
|
37
|
+
editor.notifier.on(EditorEventType.SelectionUpdated, (event) => {
|
38
38
|
if (event.kind === EditorEventType.SelectionUpdated && this.isDropdownVisible()) {
|
39
39
|
this.updateInputs();
|
40
40
|
}
|
@@ -67,7 +67,7 @@ class InsertImageWidget extends BaseWidget {
|
|
67
67
|
fillDropdown(dropdown) {
|
68
68
|
const container = document.createElement('div');
|
69
69
|
container.classList.add('insert-image-widget-dropdown-content', `${toolbarCSSPrefix}spacedList`, `${toolbarCSSPrefix}nonbutton-controls-main-list`);
|
70
|
-
const { container: chooseImageRow, selectedFiles
|
70
|
+
const { container: chooseImageRow, selectedFiles } = makeFileInput(this.localizationTable.chooseFile, this.editor, {
|
71
71
|
accepts: 'image/*',
|
72
72
|
allowMultiSelect: true,
|
73
73
|
customPickerAction: this.editor.getCurrentSettings().image?.showImagePicker,
|
@@ -115,7 +115,7 @@ class InsertImageWidget extends BaseWidget {
|
|
115
115
|
this.statusView.innerText = errorMessage;
|
116
116
|
return [];
|
117
117
|
}
|
118
|
-
return renderableImages.map(image => {
|
118
|
+
return renderableImages.map((image) => {
|
119
119
|
const { wrapper, preview } = ImageWrapper.fromRenderable(image, () => this.onImageDataUpdate());
|
120
120
|
return {
|
121
121
|
data: wrapper,
|
@@ -183,7 +183,9 @@ class InsertImageWidget extends BaseWidget {
|
|
183
183
|
this.statusView.appendChild(resetSizeButton);
|
184
184
|
}
|
185
185
|
else {
|
186
|
-
const hasLargeOrChangedImages = this.images
|
186
|
+
const hasLargeOrChangedImages = this.images
|
187
|
+
.get()
|
188
|
+
.some((image) => image.data?.isChanged() || image.data?.isLarge());
|
187
189
|
if (hasLargeOrChangedImages) {
|
188
190
|
// Still show the button -- prevents the layout from readjusting while
|
189
191
|
// scrolling through the image list
|
@@ -202,7 +204,7 @@ class InsertImageWidget extends BaseWidget {
|
|
202
204
|
};
|
203
205
|
resetInputs();
|
204
206
|
const selectionTools = this.editor.toolController.getMatchingTools(SelectionTool);
|
205
|
-
const selectedObjects = selectionTools.map(tool => tool.getSelectedObjects()).flat();
|
207
|
+
const selectedObjects = selectionTools.map((tool) => tool.getSelectedObjects()).flat();
|
206
208
|
// Check: Is there a selected image that can be edited?
|
207
209
|
let editingImage = null;
|
208
210
|
if (selectedObjects.length === 1 && selectedObjects[0] instanceof ImageComponent) {
|
@@ -214,7 +216,7 @@ class InsertImageWidget extends BaseWidget {
|
|
214
216
|
}
|
215
217
|
else if (selectedObjects.length > 0) {
|
216
218
|
// If not, clear the selection.
|
217
|
-
selectionTools.forEach(tool => tool.clearSelection());
|
219
|
+
selectionTools.forEach((tool) => tool.clearSelection());
|
218
220
|
}
|
219
221
|
// Show the submit button only when there is data to submit.
|
220
222
|
this.submitButton.style.display = 'none';
|
@@ -270,10 +272,7 @@ class InsertImageWidget extends BaseWidget {
|
|
270
272
|
for (const component of newComponents) {
|
271
273
|
commands.push(EditorImage.addElement(component), component.transformBy(originalTransform.rightMul(widthAdjustTransform)), component.setZIndex(editingImage.getZIndex()));
|
272
274
|
}
|
273
|
-
this.editor.dispatch(uniteCommands([
|
274
|
-
...commands,
|
275
|
-
eraseCommand,
|
276
|
-
]));
|
275
|
+
this.editor.dispatch(uniteCommands([...commands, eraseCommand]));
|
277
276
|
selectionTools[0]?.setSelection(newComponents);
|
278
277
|
}
|
279
278
|
else {
|
@@ -2,7 +2,7 @@ import { makeArrowBuilder } from '../../components/builders/ArrowBuilder.mjs';
|
|
2
2
|
import { makeFreehandLineBuilder } from '../../components/builders/FreehandLineBuilder.mjs';
|
3
3
|
import { makePressureSensitiveFreehandLineBuilder } from '../../components/builders/PressureSensitiveFreehandLineBuilder.mjs';
|
4
4
|
import { makeLineBuilder } from '../../components/builders/LineBuilder.mjs';
|
5
|
-
import { makeFilledRectangleBuilder, makeOutlinedRectangleBuilder } from '../../components/builders/RectangleBuilder.mjs';
|
5
|
+
import { makeFilledRectangleBuilder, makeOutlinedRectangleBuilder, } from '../../components/builders/RectangleBuilder.mjs';
|
6
6
|
import { makeOutlinedCircleBuilder } from '../../components/builders/CircleBuilder.mjs';
|
7
7
|
import { EditorEventType } from '../../types.mjs';
|
8
8
|
import makeColorInput from './components/makeColorInput.mjs';
|
@@ -46,7 +46,7 @@ class PenToolWidget extends BaseToolWidget {
|
|
46
46
|
id: 'polyline-pen',
|
47
47
|
factory: makePolylineBuilder,
|
48
48
|
},
|
49
|
-
...
|
49
|
+
...additionalPens.filter((pen) => !pen.isShapeBuilder),
|
50
50
|
// Shape pens
|
51
51
|
{
|
52
52
|
name: this.localizationTable.arrowPen,
|
@@ -78,9 +78,9 @@ class PenToolWidget extends BaseToolWidget {
|
|
78
78
|
isShapeBuilder: true,
|
79
79
|
factory: makeOutlinedCircleBuilder,
|
80
80
|
},
|
81
|
-
...
|
81
|
+
...additionalPens.filter((pen) => pen.isShapeBuilder),
|
82
82
|
].filter(filterPens);
|
83
|
-
this.editor.notifier.on(EditorEventType.ToolUpdated, toolEvt => {
|
83
|
+
this.editor.notifier.on(EditorEventType.ToolUpdated, (toolEvt) => {
|
84
84
|
if (toolEvt.kind !== EditorEventType.ToolUpdated) {
|
85
85
|
throw new Error('Invalid event type!');
|
86
86
|
}
|
@@ -123,7 +123,10 @@ class PenToolWidget extends BaseToolWidget {
|
|
123
123
|
style.factory = record.factory;
|
124
124
|
}
|
125
125
|
const strokeFactory = record?.factory;
|
126
|
-
if (!strokeFactory ||
|
126
|
+
if (!strokeFactory ||
|
127
|
+
strokeFactory === makeFreehandLineBuilder ||
|
128
|
+
strokeFactory === makePressureSensitiveFreehandLineBuilder ||
|
129
|
+
strokeFactory === makePolylineBuilder) {
|
127
130
|
return this.editor.icons.makePenIcon(style);
|
128
131
|
}
|
129
132
|
else {
|
@@ -143,8 +146,10 @@ class PenToolWidget extends BaseToolWidget {
|
|
143
146
|
isShapeBuilder: penType.isShapeBuilder ?? false,
|
144
147
|
};
|
145
148
|
});
|
146
|
-
const
|
147
|
-
const
|
149
|
+
const penItems = allChoices.filter((choice) => !choice.isShapeBuilder);
|
150
|
+
const penSelector = makeGridSelector(this.localizationTable.selectPenType, this.getCurrentPenTypeIdx(), penItems);
|
151
|
+
const shapeItems = allChoices.filter((choice) => choice.isShapeBuilder);
|
152
|
+
const shapeSelector = makeGridSelector(this.localizationTable.selectShape, this.getCurrentPenTypeIdx(), shapeItems);
|
148
153
|
const onSelectorUpdate = (newPenTypeIndex) => {
|
149
154
|
this.tool.setStrokeFactory(this.penTypes[newPenTypeIndex].factory);
|
150
155
|
};
|
@@ -161,8 +166,12 @@ class PenToolWidget extends BaseToolWidget {
|
|
161
166
|
shapeSelector.updateIcons();
|
162
167
|
},
|
163
168
|
addTo: (parent) => {
|
164
|
-
|
165
|
-
|
169
|
+
if (penItems.length) {
|
170
|
+
penSelector.addTo(parent);
|
171
|
+
}
|
172
|
+
if (shapeItems.length) {
|
173
|
+
shapeSelector.addTo(parent);
|
174
|
+
}
|
166
175
|
},
|
167
176
|
};
|
168
177
|
}
|
@@ -200,11 +209,11 @@ class PenToolWidget extends BaseToolWidget {
|
|
200
209
|
return result;
|
201
210
|
};
|
202
211
|
const stabilizationOption = addToggleButton(this.localizationTable.inputStabilization, this.editor.icons.makeStrokeSmoothingIcon());
|
203
|
-
stabilizationOption.setOnInputListener(enabled => {
|
212
|
+
stabilizationOption.setOnInputListener((enabled) => {
|
204
213
|
this.tool.setHasStabilization(enabled);
|
205
214
|
});
|
206
215
|
const autocorrectOption = addToggleButton(this.localizationTable.strokeAutocorrect, this.editor.icons.makeShapeAutocorrectIcon());
|
207
|
-
autocorrectOption.setOnInputListener(enabled => {
|
216
|
+
autocorrectOption.setOnInputListener((enabled) => {
|
208
217
|
this.tool.setStrokeAutocorrectEnabled(enabled);
|
209
218
|
});
|
210
219
|
// Help text
|
@@ -227,12 +236,12 @@ class PenToolWidget extends BaseToolWidget {
|
|
227
236
|
const container = document.createElement('div');
|
228
237
|
container.classList.add(`${toolbarCSSPrefix}spacedList`, `${toolbarCSSPrefix}nonbutton-controls-main-list`);
|
229
238
|
// Thickness: Value of the input is squared to allow for finer control/larger values.
|
230
|
-
const { container: thicknessRow, setValue: setThickness } = makeThicknessSlider(this.editor, thickness => {
|
239
|
+
const { container: thicknessRow, setValue: setThickness } = makeThicknessSlider(this.editor, (thickness) => {
|
231
240
|
this.tool.setThickness(thickness);
|
232
241
|
});
|
233
242
|
const colorRow = document.createElement('div');
|
234
243
|
const colorLabel = document.createElement('label');
|
235
|
-
const colorInputControl = makeColorInput(this.editor, color => {
|
244
|
+
const colorInputControl = makeColorInput(this.editor, (color) => {
|
236
245
|
this.tool.setColor(color);
|
237
246
|
});
|
238
247
|
const { input: colorInput, container: colorInputContainer } = colorInputControl;
|
@@ -301,7 +310,7 @@ class PenToolWidget extends BaseToolWidget {
|
|
301
310
|
deserializeFrom(state) {
|
302
311
|
super.deserializeFrom(state);
|
303
312
|
const verifyPropertyType = (propertyName, expectedType) => {
|
304
|
-
const actualType = typeof
|
313
|
+
const actualType = typeof state[propertyName];
|
305
314
|
if (actualType !== expectedType) {
|
306
315
|
throw new Error(`Deserializing property ${propertyName}: Invalid type. Expected ${expectedType},` +
|
307
316
|
` was ${actualType}.`);
|
@@ -13,7 +13,7 @@ const makeFormatMenu = (editor, selectionTool, localizationTable) => {
|
|
13
13
|
container.classList.add('selection-format-menu', `${toolbarCSSPrefix}spacedList`, `${toolbarCSSPrefix}indentedList`);
|
14
14
|
const colorRow = document.createElement('div');
|
15
15
|
const colorLabel = document.createElement('label');
|
16
|
-
const colorInputControl = makeColorInput(editor, color => {
|
16
|
+
const colorInputControl = makeColorInput(editor, (color) => {
|
17
17
|
const selection = selectionTool.getSelection();
|
18
18
|
if (selection) {
|
19
19
|
const updateStyleCommands = [];
|
@@ -94,7 +94,7 @@ export default class SelectionToolWidget extends BaseToolWidget {
|
|
94
94
|
};
|
95
95
|
updateDisabled(true);
|
96
96
|
// Enable/disable actions based on whether items are selected
|
97
|
-
this.editor.notifier.on(EditorEventType.ToolUpdated, toolEvt => {
|
97
|
+
this.editor.notifier.on(EditorEventType.ToolUpdated, (toolEvt) => {
|
98
98
|
if (toolEvt.kind !== EditorEventType.ToolUpdated) {
|
99
99
|
throw new Error('Invalid event type!');
|
100
100
|
}
|
@@ -8,7 +8,7 @@ class TextToolWidget extends BaseToolWidget {
|
|
8
8
|
super(editor, tool, 'text-tool-widget', localization);
|
9
9
|
this.tool = tool;
|
10
10
|
this.updateDropdownInputs = null;
|
11
|
-
editor.notifier.on(EditorEventType.ToolUpdated, evt => {
|
11
|
+
editor.notifier.on(EditorEventType.ToolUpdated, (evt) => {
|
12
12
|
if (evt.kind === EditorEventType.ToolUpdated && evt.tool === tool) {
|
13
13
|
this.updateIcon();
|
14
14
|
this.updateDropdownInputs?.();
|
@@ -32,7 +32,7 @@ class TextToolWidget extends BaseToolWidget {
|
|
32
32
|
const fontLabel = document.createElement('label');
|
33
33
|
const sizeInput = document.createElement('input');
|
34
34
|
const sizeLabel = document.createElement('label');
|
35
|
-
const { input: colorInput, container: colorInputContainer, setValue: setColorInputValue } = makeColorInput(this.editor, color => {
|
35
|
+
const { input: colorInput, container: colorInputContainer, setValue: setColorInputValue, } = makeColorInput(this.editor, (color) => {
|
36
36
|
this.tool.setColor(color);
|
37
37
|
});
|
38
38
|
const colorLabel = document.createElement('label');
|
@@ -100,13 +100,13 @@ class TextToolWidget extends BaseToolWidget {
|
|
100
100
|
};
|
101
101
|
}
|
102
102
|
deserializeFrom(state) {
|
103
|
-
if (state.fontFamily && typeof
|
103
|
+
if (state.fontFamily && typeof state.fontFamily === 'string') {
|
104
104
|
this.tool.setFontFamily(state.fontFamily);
|
105
105
|
}
|
106
|
-
if (state.color && typeof
|
106
|
+
if (state.color && typeof state.color === 'string') {
|
107
107
|
this.tool.setColor(Color4.fromHex(state.color));
|
108
108
|
}
|
109
|
-
if (state.textSize && typeof
|
109
|
+
if (state.textSize && typeof state.textSize === 'number') {
|
110
110
|
this.tool.setFontSize(state.textSize);
|
111
111
|
}
|
112
112
|
super.deserializeFrom(state);
|
@@ -42,7 +42,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
42
42
|
icon.style.display = 'none';
|
43
43
|
}
|
44
44
|
else if (files.length > 0) {
|
45
|
-
const fileNames = files.map(file => file.name);
|
45
|
+
const fileNames = files.map((file) => file.name);
|
46
46
|
const maxNames = 5;
|
47
47
|
if (fileNames.length <= maxNames) {
|
48
48
|
descriptionText.textContent = fileNames.join('\n');
|
@@ -84,15 +84,15 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
84
84
|
};
|
85
85
|
const addFileEventListeners = () => {
|
86
86
|
// Support dropping files
|
87
|
-
label.addEventListener('dragover', event => {
|
87
|
+
label.addEventListener('dragover', (event) => {
|
88
88
|
event.preventDefault();
|
89
89
|
label.classList.add('drag-target');
|
90
90
|
});
|
91
|
-
label.addEventListener('dragenter', event => {
|
91
|
+
label.addEventListener('dragenter', (event) => {
|
92
92
|
event.preventDefault();
|
93
93
|
label.classList.add('drag-target');
|
94
94
|
});
|
95
|
-
label.addEventListener('dragleave', event => {
|
95
|
+
label.addEventListener('dragleave', (event) => {
|
96
96
|
event.preventDefault();
|
97
97
|
// Ensure the event wasn't targeting a child.
|
98
98
|
// See https://stackoverflow.com/a/54271161 and
|
@@ -103,7 +103,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
103
103
|
}
|
104
104
|
});
|
105
105
|
// See https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop#process_the_drop
|
106
|
-
label.addEventListener('drop', event => {
|
106
|
+
label.addEventListener('drop', (event) => {
|
107
107
|
event.preventDefault();
|
108
108
|
label.classList.remove('drag-target');
|
109
109
|
const fileList = [];
|
@@ -132,7 +132,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
132
132
|
const data = await customPickerAction({
|
133
133
|
setOnCancelCallback: (onCancel) => {
|
134
134
|
if (!loading) {
|
135
|
-
throw new Error(
|
135
|
+
throw new Error("Task already completed. Can't register cancel handler.");
|
136
136
|
}
|
137
137
|
cancelLoading = () => {
|
138
138
|
cancelLoading = null;
|
@@ -154,7 +154,7 @@ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = f
|
|
154
154
|
};
|
155
155
|
input.onclick = promptForFiles;
|
156
156
|
}
|
157
|
-
selectedFiles.onUpdate(files => {
|
157
|
+
selectedFiles.onUpdate((files) => {
|
158
158
|
if (files.length === 0 && input.files && input.files.length > 0) {
|
159
159
|
input.value = '';
|
160
160
|
}
|
@@ -21,7 +21,7 @@ labelText, defaultId, choices) => {
|
|
21
21
|
menuContainer.id = `${toolbarCSSPrefix}-grid-select-id-${idCounter++}`;
|
22
22
|
stopPropagationOfScrollingWheelEvents(menuContainer);
|
23
23
|
const label = document.createElement('label');
|
24
|
-
label.
|
24
|
+
label.textContent = labelText;
|
25
25
|
label.htmlFor = menuContainer.id;
|
26
26
|
outerContainer.appendChild(label);
|
27
27
|
// All buttons in a radiogroup need the same name attribute.
|
@@ -83,7 +83,7 @@ labelText, defaultId, choices) => {
|
|
83
83
|
// Prevent the right-click menu from being shown on long-press
|
84
84
|
// (important for some toolbars that use long-press gestures to
|
85
85
|
// show grid selector labels).
|
86
|
-
buttonContainer.oncontextmenu = event => {
|
86
|
+
buttonContainer.oncontextmenu = (event) => {
|
87
87
|
event.preventDefault();
|
88
88
|
};
|
89
89
|
buttonContainer.replaceChildren(button, labelContainer);
|
@@ -102,7 +102,7 @@ labelText, defaultId, choices) => {
|
|
102
102
|
choiceRecord: record,
|
103
103
|
setChecked,
|
104
104
|
updateIcon,
|
105
|
-
updateButtonRadiogroupName
|
105
|
+
updateButtonRadiogroupName,
|
106
106
|
};
|
107
107
|
};
|
108
108
|
const buttons = [];
|
@@ -113,7 +113,7 @@ labelText, defaultId, choices) => {
|
|
113
113
|
// However, it is still possible that selectedValue does not correspond
|
114
114
|
// to a choice in `choices`. This is acceptable.
|
115
115
|
outerContainer.appendChild(menuContainer);
|
116
|
-
selectedValue.onUpdateAndNow(choiceId => {
|
116
|
+
selectedValue.onUpdateAndNow((choiceId) => {
|
117
117
|
for (let i = 0; i < buttons.length; i++) {
|
118
118
|
buttons[i].setChecked(buttons[i].choiceRecord.id === choiceId);
|
119
119
|
}
|
@@ -129,7 +129,7 @@ labelText, defaultId, choices) => {
|
|
129
129
|
}
|
130
130
|
},
|
131
131
|
updateIcons: () => {
|
132
|
-
buttons.forEach(button => button.updateIcon());
|
132
|
+
buttons.forEach((button) => button.updateIcon());
|
133
133
|
},
|
134
134
|
getRootElement() {
|
135
135
|
return outerContainer;
|
@@ -17,7 +17,10 @@ const makeSnappedList = (itemsValue) => {
|
|
17
17
|
// TODO: Does it make sense for the page marker list to be focusable?
|
18
18
|
markerContainer.setAttribute('tabindex', '-1');
|
19
19
|
const markers = [];
|
20
|
-
const pairedItems = ReactiveValue.union([
|
20
|
+
const pairedItems = ReactiveValue.union([
|
21
|
+
visibleIndex,
|
22
|
+
itemsValue,
|
23
|
+
]);
|
21
24
|
pairedItems.onUpdateAndNow(([currentVisibleIndex, items]) => {
|
22
25
|
let addedOrRemovedMarkers = false;
|
23
26
|
// Items may have been removed from the list of pages. Make the markers reflect that.
|
@@ -51,7 +54,8 @@ const makeSnappedList = (itemsValue) => {
|
|
51
54
|
}
|
52
55
|
const markerIndex = i;
|
53
56
|
marker.onclick = () => {
|
54
|
-
wrappedItems
|
57
|
+
wrappedItems
|
58
|
+
.get()[markerIndex]?.element?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
|
55
59
|
};
|
56
60
|
}
|
57
61
|
// Only call .replaceChildren when necessary -- doing so on every change would
|
@@ -99,7 +103,7 @@ const makeSnappedList = (itemsValue) => {
|
|
99
103
|
observer = null;
|
100
104
|
}
|
101
105
|
};
|
102
|
-
const wrappedItems = ReactiveValue.map(itemsValue, items => {
|
106
|
+
const wrappedItems = ReactiveValue.map(itemsValue, (items) => {
|
103
107
|
return items.map((item, index) => {
|
104
108
|
const wrapper = document.createElement('div');
|
105
109
|
if (item.element.parentElement)
|
@@ -114,7 +118,7 @@ const makeSnappedList = (itemsValue) => {
|
|
114
118
|
});
|
115
119
|
});
|
116
120
|
const lastItems = [];
|
117
|
-
wrappedItems.onUpdateAndNow(items => {
|
121
|
+
wrappedItems.onUpdateAndNow((items) => {
|
118
122
|
visibleIndex.set(-1);
|
119
123
|
for (const item of lastItems) {
|
120
124
|
observer?.unobserve(item.element);
|
@@ -144,7 +148,7 @@ const makeSnappedList = (itemsValue) => {
|
|
144
148
|
}
|
145
149
|
}
|
146
150
|
});
|
147
|
-
const visibleItem = ReactiveValue.map(visibleIndex, index => {
|
151
|
+
const visibleItem = ReactiveValue.map(visibleIndex, (index) => {
|
148
152
|
const values = itemsValue.get();
|
149
153
|
if (0 <= index && index < values.length) {
|
150
154
|
return values[index].data;
|
@@ -3,10 +3,10 @@ import KeyboardShortcutManager from '../../shortcuts/KeyboardShortcutManager.m
|
|
3
3
|
export const resizeImageToSelectionKeyboardShortcut = 'jsdraw.toolbar.SelectionTool.resizeImageToSelection';
|
4
4
|
KeyboardShortcutManager.registerDefaultKeyboardShortcut(resizeImageToSelectionKeyboardShortcut, ['ctrlOrMeta+r'], 'Resize image to selection');
|
5
5
|
// Pen tool
|
6
|
-
export const selectStrokeTypeKeyboardShortcutIds = [1, 2, 3, 4, 5, 6, 7, 8, 9].map(id => `jsdraw.toolbar.PenTool.select-pen-${id}`);
|
6
|
+
export const selectStrokeTypeKeyboardShortcutIds = [1, 2, 3, 4, 5, 6, 7, 8, 9].map((id) => `jsdraw.toolbar.PenTool.select-pen-${id}`);
|
7
7
|
for (let i = 0; i < selectStrokeTypeKeyboardShortcutIds.length; i++) {
|
8
8
|
const id = selectStrokeTypeKeyboardShortcutIds[i];
|
9
|
-
KeyboardShortcutManager.registerDefaultKeyboardShortcut(id, [`CtrlOrMeta+Digit${
|
9
|
+
KeyboardShortcutManager.registerDefaultKeyboardShortcut(id, [`CtrlOrMeta+Digit${i + 1}`], 'Select pen style ' + (i + 1));
|
10
10
|
}
|
11
11
|
// Save
|
12
12
|
export const saveKeyboardShortcut = 'jsdraw.toolbar.SaveActionWidget.save';
|
@@ -44,7 +44,7 @@ class Dropdown {
|
|
44
44
|
}
|
45
45
|
// Shift the dropdown if it's off the screen, but only if doing so moves it on to the screen
|
46
46
|
// (prevents dropdowns from going almost completely offscreen on small screens).
|
47
|
-
if (dropdownBBox.bottom > screenHeight &&
|
47
|
+
if (dropdownBBox.bottom > screenHeight && dropdownBBox.top - dropdownBBox.height > 0) {
|
48
48
|
const targetElem = this.parent.target;
|
49
49
|
translateY = `calc(-${targetElem.clientHeight}px - 100%)`;
|
50
50
|
}
|
@@ -131,7 +131,7 @@ export default class DropdownLayoutManager {
|
|
131
131
|
return;
|
132
132
|
announceForAccessibility(this.localization.dropdownShown(dropdown.parent.getTitle()));
|
133
133
|
// Share the event with other connected notifiers
|
134
|
-
this.connectedNotifiers.forEach(notifier => {
|
134
|
+
this.connectedNotifiers.forEach((notifier) => {
|
135
135
|
notifier.dispatch(EditorEventType.ToolbarDropdownShown, {
|
136
136
|
kind: EditorEventType.ToolbarDropdownShown,
|
137
137
|
fromToplevelDropdown,
|
@@ -168,7 +168,7 @@ export default class DropdownLayoutManager {
|
|
168
168
|
refreshListeners() {
|
169
169
|
const clearListeners = () => {
|
170
170
|
// Remove all listeners & resources that won't be garbage collected.
|
171
|
-
this.listeners.forEach(l => l.remove());
|
171
|
+
this.listeners.forEach((l) => l.remove());
|
172
172
|
this.listeners = [];
|
173
173
|
};
|
174
174
|
if (this.dropdowns.size === 0) {
|
@@ -176,11 +176,11 @@ export default class DropdownLayoutManager {
|
|
176
176
|
}
|
177
177
|
else if (this.listeners.length !== this.connectedNotifiers.length) {
|
178
178
|
clearListeners();
|
179
|
-
this.listeners = this.connectedNotifiers.map(notifier => {
|
179
|
+
this.listeners = this.connectedNotifiers.map((notifier) => {
|
180
180
|
return notifier.on(EditorEventType.ToolbarDropdownShown, (evt) => {
|
181
|
-
if (evt.kind !== EditorEventType.ToolbarDropdownShown
|
181
|
+
if (evt.kind !== EditorEventType.ToolbarDropdownShown ||
|
182
182
|
// Don't forward to ourselves events that we originally triggered.
|
183
|
-
|
183
|
+
evt.layoutManager === this) {
|
184
184
|
return;
|
185
185
|
}
|
186
186
|
this.notifier.dispatch(DropdownEventType.DropdownShown, {
|
@@ -11,7 +11,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
11
11
|
};
|
12
12
|
var _BaseTool_enabled, _BaseTool_group, _BaseTool_inputMapper, _BaseTool_readOnlyEditorChangeListener;
|
13
13
|
import { EditorEventType } from '../types.mjs';
|
14
|
-
import { InputEvtType } from '../inputEvents.mjs';
|
14
|
+
import { InputEvtType, } from '../inputEvents.mjs';
|
15
15
|
import { ReactiveValue } from '../util/ReactiveValue.mjs';
|
16
16
|
class BaseTool {
|
17
17
|
constructor(notifier, description) {
|
@@ -22,7 +22,7 @@ class BaseTool {
|
|
22
22
|
_BaseTool_inputMapper.set(this, null);
|
23
23
|
_BaseTool_readOnlyEditorChangeListener.set(this, null);
|
24
24
|
__classPrivateFieldSet(this, _BaseTool_enabled, ReactiveValue.fromInitialValue(true), "f");
|
25
|
-
__classPrivateFieldGet(this, _BaseTool_enabled, "f").onUpdate(enabled => {
|
25
|
+
__classPrivateFieldGet(this, _BaseTool_enabled, "f").onUpdate((enabled) => {
|
26
26
|
// Ensure that at most one tool in the group is enabled.
|
27
27
|
if (enabled) {
|
28
28
|
__classPrivateFieldGet(this, _BaseTool_group, "f")?.notifyEnabled(this);
|
@@ -46,7 +46,7 @@ class BaseTool {
|
|
46
46
|
setInputMapper(mapper) {
|
47
47
|
__classPrivateFieldSet(this, _BaseTool_inputMapper, mapper, "f");
|
48
48
|
if (mapper) {
|
49
|
-
mapper.setEmitListener(event => this.dispatchEventToCallback(event));
|
49
|
+
mapper.setEmitListener((event) => this.dispatchEventToCallback(event));
|
50
50
|
}
|
51
51
|
}
|
52
52
|
getInputMapper() {
|
@@ -94,7 +94,9 @@ class BaseTool {
|
|
94
94
|
* Returns true iff the tool handled the event and thus should receive additional
|
95
95
|
* events.
|
96
96
|
*/
|
97
|
-
onPointerDown(_event) {
|
97
|
+
onPointerDown(_event) {
|
98
|
+
return false;
|
99
|
+
}
|
98
100
|
onPointerMove(_event) { }
|
99
101
|
/**
|
100
102
|
* Returns true iff there are additional pointers down and the tool should
|
@@ -23,7 +23,9 @@ class EraserSwitcher extends BaseTool {
|
|
23
23
|
onPointerDown(event) {
|
24
24
|
if (event.allPointers.length === 1 && event.current.device === PointerDevice.Eraser) {
|
25
25
|
const toolController = this.editor.toolController;
|
26
|
-
const enabledPrimaryTools = toolController
|
26
|
+
const enabledPrimaryTools = toolController
|
27
|
+
.getPrimaryTools()
|
28
|
+
.filter((tool) => tool.isEnabled());
|
27
29
|
if (enabledPrimaryTools.length) {
|
28
30
|
this.previousEnabledTool = enabledPrimaryTools[0];
|
29
31
|
}
|
@@ -74,7 +76,7 @@ export default class Eraser extends BaseTool {
|
|
74
76
|
this.addCommands = [];
|
75
77
|
this.thickness = options?.thickness ?? 10;
|
76
78
|
this.thicknessValue = ReactiveValue.fromInitialValue(this.thickness);
|
77
|
-
this.thicknessValue.onUpdate(value => {
|
79
|
+
this.thicknessValue.onUpdate((value) => {
|
78
80
|
this.thickness = value;
|
79
81
|
this.editor.notifier.dispatch(EditorEventType.ToolUpdated, {
|
80
82
|
kind: EditorEventType.ToolUpdated,
|
@@ -82,7 +84,7 @@ export default class Eraser extends BaseTool {
|
|
82
84
|
});
|
83
85
|
});
|
84
86
|
this.modeValue = ReactiveValue.fromInitialValue(options?.mode ?? EraserMode.FullStroke);
|
85
|
-
this.modeValue.onUpdate(_value => {
|
87
|
+
this.modeValue.onUpdate((_value) => {
|
86
88
|
this.editor.notifier.dispatch(EditorEventType.ToolUpdated, {
|
87
89
|
kind: EditorEventType.ToolUpdated,
|
88
90
|
tool: this,
|
@@ -136,18 +138,20 @@ export default class Eraser extends BaseTool {
|
|
136
138
|
const eraserRect = this.getEraserRect(currentPoint);
|
137
139
|
const line = new LineSegment2(this.lastPoint, currentPoint);
|
138
140
|
const region = Rect2.union(line.bbox, eraserRect);
|
139
|
-
const intersectingElems = this.editor.image
|
141
|
+
const intersectingElems = this.editor.image
|
142
|
+
.getElementsIntersectingRegion(region)
|
143
|
+
.filter((component) => {
|
140
144
|
return component.intersects(line) || component.intersectsRect(eraserRect);
|
141
145
|
});
|
142
146
|
// Only erase components that could be selected (and thus interacted with)
|
143
147
|
// by the user.
|
144
|
-
const eraseableElems = intersectingElems.filter(elem => elem.isSelectable());
|
148
|
+
const eraseableElems = intersectingElems.filter((elem) => elem.isSelectable());
|
145
149
|
if (this.modeValue.get() === EraserMode.FullStroke) {
|
146
150
|
// Remove any intersecting elements.
|
147
151
|
this.toRemove.push(...eraseableElems);
|
148
152
|
// Create new Erase commands for the now-to-be-erased elements and apply them.
|
149
|
-
const newPartialCommands = eraseableElems.map(elem => new Erase([elem]));
|
150
|
-
newPartialCommands.forEach(cmd => cmd.apply(this.editor));
|
153
|
+
const newPartialCommands = eraseableElems.map((elem) => new Erase([elem]));
|
154
|
+
newPartialCommands.forEach((cmd) => cmd.apply(this.editor));
|
151
155
|
this.eraseCommands.push(...newPartialCommands);
|
152
156
|
}
|
153
157
|
else {
|
@@ -168,14 +172,15 @@ export default class Eraser extends BaseTool {
|
|
168
172
|
// Join the current and previous rectangles so that points between events are also
|
169
173
|
// erased.
|
170
174
|
const erasePath = Path.fromConvexHullOf([
|
171
|
-
...eraserRect.corners,
|
172
|
-
|
175
|
+
...eraserRect.corners,
|
176
|
+
...this.getEraserRect(this.lastPoint ?? currentPoint).corners,
|
177
|
+
].map((p) => this.editor.viewport.roundPoint(p)));
|
173
178
|
toAdd.push(...targetElem.withRegionErased(erasePath, this.editor.viewport));
|
174
179
|
}
|
175
180
|
const eraseCommand = new Erase(toErase);
|
176
|
-
const newAddCommands = toAdd.map(elem => EditorImage.addElement(elem));
|
181
|
+
const newAddCommands = toAdd.map((elem) => EditorImage.addElement(elem));
|
177
182
|
eraseCommand.apply(this.editor);
|
178
|
-
newAddCommands.forEach(command => command.apply(this.editor));
|
183
|
+
newAddCommands.forEach((command) => command.apply(this.editor));
|
179
184
|
const finalToErase = [];
|
180
185
|
for (const item of toErase) {
|
181
186
|
if (this.toAdd.has(item)) {
|
@@ -214,27 +219,27 @@ export default class Eraser extends BaseTool {
|
|
214
219
|
this.eraseTo(event.current.canvasPos);
|
215
220
|
const commands = [];
|
216
221
|
if (this.addCommands.length > 0) {
|
217
|
-
this.addCommands.forEach(cmd => cmd.unapply(this.editor));
|
222
|
+
this.addCommands.forEach((cmd) => cmd.unapply(this.editor));
|
218
223
|
// Remove items from toAdd that are also present in toRemove -- adding, then
|
219
224
|
// removing these does nothing, and can break undo/redo.
|
220
225
|
for (const item of this.toAdd) {
|
221
226
|
if (this.toRemove.includes(item)) {
|
222
227
|
this.toAdd.delete(item);
|
223
|
-
this.toRemove = this.toRemove.filter(other => other !== item);
|
228
|
+
this.toRemove = this.toRemove.filter((other) => other !== item);
|
224
229
|
}
|
225
230
|
}
|
226
231
|
for (const item of this.toRemove) {
|
227
232
|
if (this.toAdd.has(item)) {
|
228
233
|
this.toAdd.delete(item);
|
229
|
-
this.toRemove = this.toRemove.filter(other => other !== item);
|
234
|
+
this.toRemove = this.toRemove.filter((other) => other !== item);
|
230
235
|
}
|
231
236
|
}
|
232
|
-
commands.push(...[...this.toAdd].map(a => EditorImage.addElement(a)));
|
237
|
+
commands.push(...[...this.toAdd].map((a) => EditorImage.addElement(a)));
|
233
238
|
this.addCommands = [];
|
234
239
|
}
|
235
240
|
if (this.eraseCommands.length > 0) {
|
236
241
|
// Undo commands for each individual component and unite into a single command.
|
237
|
-
this.eraseCommands.forEach(cmd => cmd.unapply(this.editor));
|
242
|
+
this.eraseCommands.forEach((cmd) => cmd.unapply(this.editor));
|
238
243
|
this.eraseCommands = [];
|
239
244
|
const command = new Erase(this.toRemove);
|
240
245
|
commands.push(command);
|
@@ -248,8 +253,8 @@ export default class Eraser extends BaseTool {
|
|
248
253
|
this.clearPreview();
|
249
254
|
}
|
250
255
|
onGestureCancel(_event) {
|
251
|
-
this.addCommands.forEach(cmd => cmd.unapply(this.editor));
|
252
|
-
this.eraseCommands.forEach(cmd => cmd.unapply(this.editor));
|
256
|
+
this.addCommands.forEach((cmd) => cmd.unapply(this.editor));
|
257
|
+
this.eraseCommands.forEach((cmd) => cmd.unapply(this.editor));
|
253
258
|
this.eraseCommands = [];
|
254
259
|
this.addCommands = [];
|
255
260
|
this.clearPreview();
|
@@ -258,10 +263,10 @@ export default class Eraser extends BaseTool {
|
|
258
263
|
const shortcuts = this.editor.shortcuts;
|
259
264
|
let newThickness;
|
260
265
|
if (shortcuts.matchesShortcut(decreaseSizeKeyboardShortcutId, event)) {
|
261
|
-
newThickness = this.getThickness() * 2 / 3;
|
266
|
+
newThickness = (this.getThickness() * 2) / 3;
|
262
267
|
}
|
263
268
|
else if (shortcuts.matchesShortcut(increaseSizeKeyboardShortcutId, event)) {
|
264
|
-
newThickness = this.getThickness() * 3 / 2;
|
269
|
+
newThickness = (this.getThickness() * 3) / 2;
|
265
270
|
}
|
266
271
|
if (newThickness !== undefined) {
|
267
272
|
newThickness = Math.min(Math.max(1, newThickness), 200);
|