js-draw 1.21.3 → 1.22.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +103 -75
- package/build-config.json +2 -2
- package/dist/Editor.css +29 -16
- package/dist/bundle.js +2 -2
- package/dist/bundledStyles.js +1 -1
- package/dist/cjs/Editor.js +36 -22
- package/dist/cjs/EventDispatcher.js +1 -1
- package/dist/cjs/Pointer.js +3 -3
- package/dist/cjs/SVGLoader/SVGLoader.js +13 -6
- package/dist/cjs/UndoRedoHistory.js +1 -1
- package/dist/cjs/Viewport.js +4 -2
- package/dist/cjs/commands/Command.js +7 -5
- package/dist/cjs/commands/Duplicate.js +2 -2
- package/dist/cjs/commands/Erase.js +3 -4
- package/dist/cjs/commands/invertCommand.js +4 -4
- package/dist/cjs/commands/lib.d.ts +1 -1
- package/dist/cjs/commands/uniteCommands.js +4 -4
- package/dist/cjs/components/AbstractComponent.d.ts +1 -1
- package/dist/cjs/components/AbstractComponent.js +3 -3
- package/dist/cjs/components/BackgroundComponent.js +8 -6
- package/dist/cjs/components/ImageComponent.js +12 -5
- package/dist/cjs/components/RestylableComponent.js +1 -1
- package/dist/cjs/components/SVGGlobalAttributesObject.js +1 -2
- package/dist/cjs/components/Stroke.js +37 -24
- package/dist/cjs/components/TextComponent.js +13 -10
- package/dist/cjs/components/UnknownSVGObject.js +2 -3
- package/dist/cjs/components/builders/ArrowBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/ArrowBuilder.js +9 -3
- package/dist/cjs/components/builders/CircleBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/CircleBuilder.js +11 -4
- package/dist/cjs/components/builders/FreehandLineBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/FreehandLineBuilder.js +10 -4
- package/dist/cjs/components/builders/LineBuilder.d.ts +6 -0
- package/dist/cjs/components/builders/LineBuilder.js +8 -4
- package/dist/cjs/components/builders/PolylineBuilder.d.ts +4 -1
- package/dist/cjs/components/builders/PolylineBuilder.js +9 -5
- package/dist/cjs/components/builders/PressureSensitiveFreehandLineBuilder.js +16 -10
- package/dist/cjs/components/builders/RectangleBuilder.d.ts +12 -0
- package/dist/cjs/components/builders/RectangleBuilder.js +17 -3
- package/dist/cjs/components/builders/autocorrect/makeShapeFitAutocorrect.js +5 -8
- package/dist/cjs/components/builders/autocorrect/makeSnapToGridAutocorrect.js +1 -1
- package/dist/cjs/components/builders/lib.d.ts +7 -0
- package/dist/cjs/components/builders/lib.js +18 -0
- package/dist/cjs/components/lib.d.ts +1 -4
- package/dist/cjs/components/lib.js +2 -9
- package/dist/cjs/components/util/StrokeSmoother.js +5 -6
- package/dist/cjs/dialogs/makeAboutDialog.js +1 -1
- package/dist/cjs/dialogs/makeMessageDialog.js +2 -2
- package/dist/cjs/image/EditorImage.js +13 -15
- package/dist/cjs/image/export/editorImageToSVG.js +1 -1
- package/dist/cjs/inputEvents.js +3 -3
- package/dist/cjs/lib.d.ts +2 -2
- package/dist/cjs/localizations/de.js +2 -2
- package/dist/cjs/localizations/es.js +7 -3
- package/dist/cjs/rendering/Display.js +7 -3
- package/dist/cjs/rendering/RenderablePathSpec.js +26 -11
- package/dist/cjs/rendering/RenderingStyle.js +22 -15
- package/dist/cjs/rendering/TextRenderingStyle.js +1 -1
- package/dist/cjs/rendering/caching/CacheRecord.js +1 -1
- package/dist/cjs/rendering/caching/CacheRecordManager.js +1 -1
- package/dist/cjs/rendering/caching/RenderingCache.js +1 -1
- package/dist/cjs/rendering/caching/RenderingCacheNode.js +26 -15
- package/dist/cjs/rendering/caching/testUtils.js +2 -2
- package/dist/cjs/rendering/renderers/AbstractRenderer.js +3 -1
- package/dist/cjs/rendering/renderers/CanvasRenderer.js +4 -3
- package/dist/cjs/rendering/renderers/DummyRenderer.js +1 -1
- package/dist/cjs/rendering/renderers/SVGRenderer.js +37 -19
- package/dist/cjs/rendering/renderers/TextOnlyRenderer.js +13 -15
- package/dist/cjs/shortcuts/KeyBinding.js +6 -12
- package/dist/cjs/shortcuts/KeyboardShortcutManager.js +2 -2
- package/dist/cjs/testing/createEditor.js +6 -1
- package/dist/cjs/testing/findNodeWithText.d.ts +4 -1
- package/dist/cjs/testing/findNodeWithText.js +12 -3
- package/dist/cjs/testing/getUniquePointerId.js +1 -1
- package/dist/cjs/testing/sendHtmlSwipe.js +7 -3
- package/dist/cjs/testing/sendPenEvent.js +1 -3
- package/dist/cjs/testing/sendTouchEvent.js +1 -4
- package/dist/cjs/testing/startPinchGesture.js +3 -1
- package/dist/cjs/toolbar/AbstractToolbar.js +7 -11
- package/dist/cjs/toolbar/EdgeToolbar.js +11 -15
- package/dist/cjs/toolbar/IconProvider.js +5 -3
- package/dist/cjs/toolbar/localization.js +3 -3
- package/dist/cjs/toolbar/utils/HelpDisplay.js +8 -6
- package/dist/cjs/toolbar/utils/makeDraggable.js +4 -7
- package/dist/cjs/toolbar/widgets/BaseToolWidget.js +3 -2
- package/dist/cjs/toolbar/widgets/BaseWidget.js +7 -7
- package/dist/cjs/toolbar/widgets/DocumentPropertiesWidget.js +2 -2
- package/dist/cjs/toolbar/widgets/EraserToolWidget.js +5 -3
- package/dist/cjs/toolbar/widgets/HandToolWidget.js +8 -6
- package/dist/cjs/toolbar/widgets/InsertImageWidget/InsertImageWidget.js +9 -10
- package/dist/cjs/toolbar/widgets/PenToolWidget.js +22 -13
- package/dist/cjs/toolbar/widgets/SelectionToolWidget.js +2 -2
- package/dist/cjs/toolbar/widgets/TextToolWidget.js +5 -5
- package/dist/cjs/toolbar/widgets/components/makeFileInput.js +7 -7
- package/dist/cjs/toolbar/widgets/components/makeGridSelector.js +5 -5
- package/dist/cjs/toolbar/widgets/components/makeSnappedList.js +9 -5
- package/dist/cjs/toolbar/widgets/keybindings.js +2 -2
- package/dist/cjs/toolbar/widgets/layout/DropdownLayoutManager.js +6 -6
- package/dist/cjs/tools/BaseTool.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 +17 -12
- package/dist/cjs/tools/PasteHandler.js +8 -2
- package/dist/cjs/tools/Pen.js +17 -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/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/guessKeyCodeFromKey.js +1 -1
- package/dist/cjs/util/listenForKeyboardEventsFrom.js +8 -6
- package/dist/cjs/util/waitForAll.js +3 -3
- package/dist/cjs/util/waitForImageLoaded.js +3 -3
- package/dist/cjs/util/waitForTimeout.js +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/mjs/Editor.mjs +37 -23
- package/dist/mjs/EventDispatcher.mjs +1 -1
- package/dist/mjs/Pointer.mjs +3 -3
- package/dist/mjs/SVGLoader/SVGLoader.mjs +14 -7
- package/dist/mjs/UndoRedoHistory.mjs +1 -1
- package/dist/mjs/Viewport.mjs +4 -2
- package/dist/mjs/commands/Command.mjs +7 -5
- package/dist/mjs/commands/Duplicate.mjs +2 -2
- package/dist/mjs/commands/Erase.mjs +3 -4
- package/dist/mjs/commands/invertCommand.mjs +4 -4
- package/dist/mjs/commands/lib.d.ts +1 -1
- package/dist/mjs/commands/lib.mjs +1 -1
- package/dist/mjs/commands/uniteCommands.mjs +4 -4
- package/dist/mjs/components/AbstractComponent.d.ts +1 -1
- package/dist/mjs/components/AbstractComponent.mjs +3 -3
- package/dist/mjs/components/BackgroundComponent.mjs +10 -8
- package/dist/mjs/components/ImageComponent.mjs +12 -5
- package/dist/mjs/components/RestylableComponent.mjs +2 -2
- package/dist/mjs/components/SVGGlobalAttributesObject.mjs +1 -2
- package/dist/mjs/components/Stroke.mjs +40 -27
- package/dist/mjs/components/TextComponent.mjs +15 -12
- package/dist/mjs/components/UnknownSVGObject.mjs +2 -3
- package/dist/mjs/components/builders/ArrowBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/ArrowBuilder.mjs +9 -3
- package/dist/mjs/components/builders/CircleBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/CircleBuilder.mjs +11 -4
- package/dist/mjs/components/builders/FreehandLineBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/FreehandLineBuilder.mjs +10 -4
- package/dist/mjs/components/builders/LineBuilder.d.ts +6 -0
- package/dist/mjs/components/builders/LineBuilder.mjs +8 -4
- package/dist/mjs/components/builders/PolylineBuilder.d.ts +4 -1
- package/dist/mjs/components/builders/PolylineBuilder.mjs +10 -6
- package/dist/mjs/components/builders/PressureSensitiveFreehandLineBuilder.mjs +17 -11
- package/dist/mjs/components/builders/RectangleBuilder.d.ts +12 -0
- package/dist/mjs/components/builders/RectangleBuilder.mjs +17 -3
- package/dist/mjs/components/builders/autocorrect/makeShapeFitAutocorrect.mjs +5 -8
- package/dist/mjs/components/builders/autocorrect/makeSnapToGridAutocorrect.mjs +1 -1
- package/dist/mjs/components/builders/lib.d.ts +7 -0
- package/dist/mjs/components/builders/lib.mjs +7 -0
- package/dist/mjs/components/lib.d.ts +1 -4
- package/dist/mjs/components/lib.mjs +2 -5
- package/dist/mjs/components/util/StrokeSmoother.mjs +5 -6
- package/dist/mjs/dialogs/makeAboutDialog.mjs +1 -1
- package/dist/mjs/dialogs/makeMessageDialog.mjs +2 -2
- package/dist/mjs/image/EditorImage.mjs +13 -15
- package/dist/mjs/image/export/editorImageToSVG.mjs +1 -1
- package/dist/mjs/inputEvents.mjs +3 -3
- package/dist/mjs/lib.d.ts +2 -2
- package/dist/mjs/lib.mjs +2 -2
- package/dist/mjs/localization.mjs +2 -2
- package/dist/mjs/localizations/de.mjs +2 -2
- package/dist/mjs/localizations/es.mjs +7 -3
- package/dist/mjs/rendering/Display.mjs +7 -3
- package/dist/mjs/rendering/RenderablePathSpec.mjs +26 -11
- package/dist/mjs/rendering/RenderingStyle.mjs +22 -15
- package/dist/mjs/rendering/TextRenderingStyle.mjs +1 -1
- package/dist/mjs/rendering/caching/CacheRecord.mjs +1 -1
- package/dist/mjs/rendering/caching/CacheRecordManager.mjs +1 -1
- package/dist/mjs/rendering/caching/RenderingCache.mjs +1 -1
- package/dist/mjs/rendering/caching/RenderingCacheNode.mjs +26 -15
- package/dist/mjs/rendering/caching/testUtils.mjs +2 -2
- package/dist/mjs/rendering/renderers/AbstractRenderer.mjs +3 -1
- package/dist/mjs/rendering/renderers/CanvasRenderer.mjs +4 -3
- package/dist/mjs/rendering/renderers/DummyRenderer.mjs +1 -1
- package/dist/mjs/rendering/renderers/SVGRenderer.mjs +38 -20
- package/dist/mjs/rendering/renderers/TextOnlyRenderer.mjs +13 -15
- package/dist/mjs/shortcuts/KeyBinding.mjs +6 -12
- package/dist/mjs/shortcuts/KeyboardShortcutManager.mjs +2 -2
- package/dist/mjs/testing/createEditor.mjs +6 -1
- package/dist/mjs/testing/findNodeWithText.d.ts +4 -1
- package/dist/mjs/testing/findNodeWithText.mjs +12 -3
- package/dist/mjs/testing/getUniquePointerId.mjs +1 -1
- package/dist/mjs/testing/sendHtmlSwipe.mjs +7 -3
- package/dist/mjs/testing/sendPenEvent.mjs +1 -3
- package/dist/mjs/testing/sendTouchEvent.mjs +1 -4
- package/dist/mjs/testing/startPinchGesture.mjs +3 -1
- package/dist/mjs/toolbar/AbstractToolbar.mjs +7 -11
- package/dist/mjs/toolbar/EdgeToolbar.mjs +11 -15
- package/dist/mjs/toolbar/IconProvider.mjs +5 -3
- package/dist/mjs/toolbar/localization.mjs +3 -3
- package/dist/mjs/toolbar/utils/HelpDisplay.mjs +8 -6
- package/dist/mjs/toolbar/utils/makeDraggable.mjs +4 -7
- package/dist/mjs/toolbar/widgets/BaseToolWidget.mjs +3 -2
- package/dist/mjs/toolbar/widgets/BaseWidget.mjs +8 -8
- package/dist/mjs/toolbar/widgets/DocumentPropertiesWidget.mjs +2 -2
- package/dist/mjs/toolbar/widgets/EraserToolWidget.mjs +5 -3
- package/dist/mjs/toolbar/widgets/HandToolWidget.mjs +8 -6
- package/dist/mjs/toolbar/widgets/InsertImageWidget/InsertImageWidget.mjs +9 -10
- package/dist/mjs/toolbar/widgets/PenToolWidget.mjs +23 -14
- package/dist/mjs/toolbar/widgets/SelectionToolWidget.mjs +2 -2
- package/dist/mjs/toolbar/widgets/TextToolWidget.mjs +5 -5
- package/dist/mjs/toolbar/widgets/components/makeFileInput.mjs +7 -7
- package/dist/mjs/toolbar/widgets/components/makeGridSelector.mjs +5 -5
- package/dist/mjs/toolbar/widgets/components/makeSnappedList.mjs +9 -5
- package/dist/mjs/toolbar/widgets/keybindings.mjs +2 -2
- package/dist/mjs/toolbar/widgets/layout/DropdownLayoutManager.mjs +6 -6
- package/dist/mjs/tools/BaseTool.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 +18 -13
- package/dist/mjs/tools/PasteHandler.mjs +8 -2
- package/dist/mjs/tools/Pen.mjs +18 -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/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/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
@@ -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);
|
@@ -22,7 +22,7 @@ export default class FindTool extends BaseTool {
|
|
22
22
|
}
|
23
23
|
getMatches(searchFor) {
|
24
24
|
const lowerSearchFor = searchFor.toLocaleLowerCase();
|
25
|
-
const matchingComponents = this.editor.image.getAllElements().filter(component => {
|
25
|
+
const matchingComponents = this.editor.image.getAllElements().filter((component) => {
|
26
26
|
let text = '';
|
27
27
|
if (component instanceof TextComponent) {
|
28
28
|
text = component.getText();
|
@@ -37,7 +37,7 @@ export default class FindTool extends BaseTool {
|
|
37
37
|
const hasSameCaseMatch = text.indexOf(searchFor) !== -1;
|
38
38
|
return hasLowercaseMatch || hasSameCaseMatch;
|
39
39
|
});
|
40
|
-
return matchingComponents.map(match => match.getBBox());
|
40
|
+
return matchingComponents.map((match) => match.getBBox());
|
41
41
|
}
|
42
42
|
focusCurrentMatch() {
|
43
43
|
const matches = this.getMatches(this.searchInput.value);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { InputEvtType, isPointerEvt } from '../../inputEvents.mjs';
|
2
2
|
import InputMapper from './InputMapper.mjs';
|
3
|
-
import StationaryPenDetector, { defaultStationaryDetectionConfig } from '../util/StationaryPenDetector.mjs';
|
3
|
+
import StationaryPenDetector, { defaultStationaryDetectionConfig, } from '../util/StationaryPenDetector.mjs';
|
4
4
|
import { PointerDevice } from '../../Pointer.mjs';
|
5
5
|
export default class ContextMenuRecognizer extends InputMapper {
|
6
6
|
constructor() {
|
@@ -15,9 +15,7 @@ export default class ContextMenuRecognizer extends InputMapper {
|
|
15
15
|
* one such device.
|
16
16
|
*/
|
17
17
|
canMakeLongPressMenuEvent(event) {
|
18
|
-
const allowedDevices = [
|
19
|
-
PointerDevice.Touch,
|
20
|
-
];
|
18
|
+
const allowedDevices = [PointerDevice.Touch];
|
21
19
|
return event.allPointers.length === 1 && allowedDevices.includes(event.current.device);
|
22
20
|
}
|
23
21
|
onEvent(event) {
|
@@ -19,7 +19,7 @@ class InputMapper {
|
|
19
19
|
}
|
20
20
|
// @internal
|
21
21
|
setEmitListener(listener) {
|
22
|
-
if (listener && typeof
|
22
|
+
if (listener && typeof listener === 'object') {
|
23
23
|
__classPrivateFieldSet(this, _InputMapper_listener, (event) => {
|
24
24
|
return listener.onEvent(event) ?? false;
|
25
25
|
}, "f");
|
@@ -42,7 +42,7 @@ class InputPipeline extends InputMapper {
|
|
42
42
|
__classPrivateFieldGet(this, _InputPipeline_tail, "f").setEmitListener(mapper);
|
43
43
|
__classPrivateFieldSet(this, _InputPipeline_tail, mapper, "f");
|
44
44
|
}
|
45
|
-
__classPrivateFieldGet(this, _InputPipeline_tail, "f").setEmitListener(event => this.emit(event));
|
45
|
+
__classPrivateFieldGet(this, _InputPipeline_tail, "f").setEmitListener((event) => this.emit(event));
|
46
46
|
}
|
47
47
|
}
|
48
48
|
_InputPipeline_head = new WeakMap(), _InputPipeline_tail = new WeakMap();
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { InputEvtType, isPointerEvt } from '../../inputEvents.mjs';
|
1
|
+
import { InputEvtType, isPointerEvt, } from '../../inputEvents.mjs';
|
2
2
|
import InputMapper from './InputMapper.mjs';
|
3
3
|
import { Vec2 } from '@js-draw/math';
|
4
4
|
import untilNextAnimationFrame from '../../util/untilNextAnimationFrame.mjs';
|
@@ -48,10 +48,14 @@ class StylusInputStabilizer {
|
|
48
48
|
const springForce = toTarget.times(this.options.springConstant);
|
49
49
|
const gravityAccel = 10;
|
50
50
|
const normalForceMagnitude = this.options.mass * gravityAccel;
|
51
|
-
const frictionForce = this.velocity
|
52
|
-
|
51
|
+
const frictionForce = this.velocity
|
52
|
+
.normalizedOrZero()
|
53
|
+
.times(-this.options.frictionCoefficient * normalForceMagnitude);
|
54
|
+
const acceleration = springForce.plus(frictionForce).times(1 / this.options.mass);
|
53
55
|
const decayFactor = this.options.velocityDecayFactor;
|
54
|
-
const springVelocity = this.velocity
|
56
|
+
const springVelocity = this.velocity
|
57
|
+
.times(1 - decayFactor)
|
58
|
+
.plus(acceleration.times(deltaTimeMs / 1000));
|
55
59
|
// An alternate velocity that goes directly towards the target.
|
56
60
|
const toTargetVelocity = toTarget.normalizedOrZero().times(springVelocity.length());
|
57
61
|
return toTargetVelocity.lerp(springVelocity, this.options.inertiaFraction);
|
@@ -117,7 +121,9 @@ export default class InputStabilizer extends InputMapper {
|
|
117
121
|
this.lastPointerEvent = event;
|
118
122
|
}
|
119
123
|
// Only apply smoothing if there is a single pointer.
|
120
|
-
if (event.kind === InputEvtType.GestureCancelEvt ||
|
124
|
+
if (event.kind === InputEvtType.GestureCancelEvt ||
|
125
|
+
event.allPointers.length > 1 ||
|
126
|
+
this.stabilizer === null) {
|
121
127
|
return this.emit(event);
|
122
128
|
}
|
123
129
|
this.stabilizer.setTarget(event.current.screenPos);
|
@@ -161,7 +167,8 @@ export default class InputStabilizer extends InputMapper {
|
|
161
167
|
}
|
162
168
|
}
|
163
169
|
const handled = this.mapPointerEvent(event);
|
164
|
-
if (event.kind === InputEvtType.PointerUpEvt ||
|
170
|
+
if (event.kind === InputEvtType.PointerUpEvt ||
|
171
|
+
event.kind === InputEvtType.GestureCancelEvt) {
|
165
172
|
this.stabilizer?.cancel();
|
166
173
|
this.stabilizer = null;
|
167
174
|
}
|
@@ -48,18 +48,21 @@ export default class StrokeKeyboardControl extends InputMapper {
|
|
48
48
|
}
|
49
49
|
onEvent(event) {
|
50
50
|
const shortcuts = this.shortcuts;
|
51
|
-
if (event.kind === InputEvtType.PointerDownEvt ||
|
51
|
+
if (event.kind === InputEvtType.PointerDownEvt ||
|
52
|
+
event.kind === InputEvtType.PointerMoveEvt ||
|
53
|
+
event.kind === InputEvtType.PointerUpEvt) {
|
52
54
|
if (event.kind === InputEvtType.PointerDownEvt) {
|
53
55
|
this.startPointCanvas = event.current.canvasPos;
|
54
56
|
}
|
55
57
|
event = this.mapPointerEvent(event);
|
56
58
|
}
|
57
59
|
let handled = this.emit(event);
|
58
|
-
if (
|
59
|
-
|
60
|
+
if (
|
61
|
+
// Always check keyUpEvents (in case we handled the corresponding keyDown event)
|
62
|
+
event.kind === InputEvtType.KeyUpEvent ||
|
60
63
|
// Only handle key press events if another tool isn't handling it. We don't want
|
61
64
|
// snap to grid/angle lock to conflict with selection/another tool's shortcuts.
|
62
|
-
|
65
|
+
(!handled && event.kind === InputEvtType.KeyPressEvent)) {
|
63
66
|
const isKeyPress = event.kind === InputEvtType.KeyPressEvent;
|
64
67
|
if (shortcuts.matchesShortcut(snapToGridKeyboardShortcutId, event)) {
|
65
68
|
this.snapToGridEnabled = isKeyPress;
|
@@ -54,7 +54,7 @@ export default class PanZoom extends BaseTool {
|
|
54
54
|
canReceiveInputInReadOnlyEditor(): boolean;
|
55
55
|
computePinchData(p1: Pointer, p2: Pointer): PinchData;
|
56
56
|
private allPointersAreOfType;
|
57
|
-
onPointerDown({ allPointers: pointers, current: currentPointer }: PointerEvt): boolean;
|
57
|
+
onPointerDown({ allPointers: pointers, current: currentPointer, }: PointerEvt): boolean;
|
58
58
|
private updateVelocity;
|
59
59
|
private getCenterDelta;
|
60
60
|
private toSnappedRotationDelta;
|
@@ -4,7 +4,7 @@ import { EditorEventType } from '../types.mjs';
|
|
4
4
|
import untilNextAnimationFrame from '../util/untilNextAnimationFrame.mjs';
|
5
5
|
import { Viewport } from '../Viewport.mjs';
|
6
6
|
import BaseTool from './BaseTool.mjs';
|
7
|
-
import { moveDownKeyboardShortcutId, moveLeftKeyboardShortcutId, moveRightKeyboardShortcutId, moveUpKeyboardShortcutId, rotateClockwiseKeyboardShortcutId, rotateCounterClockwiseKeyboardShortcutId, zoomInKeyboardShortcutId, zoomOutKeyboardShortcutId } from './keybindings.mjs';
|
7
|
+
import { moveDownKeyboardShortcutId, moveLeftKeyboardShortcutId, moveRightKeyboardShortcutId, moveUpKeyboardShortcutId, rotateClockwiseKeyboardShortcutId, rotateCounterClockwiseKeyboardShortcutId, zoomInKeyboardShortcutId, zoomOutKeyboardShortcutId, } from './keybindings.mjs';
|
8
8
|
export var PanZoomMode;
|
9
9
|
(function (PanZoomMode) {
|
10
10
|
/** Touch gestures with a single pointer. Ignores non-touch gestures. */
|
@@ -117,9 +117,9 @@ export default class PanZoom extends BaseTool {
|
|
117
117
|
return { canvasCenter, screenCenter, angle, dist };
|
118
118
|
}
|
119
119
|
allPointersAreOfType(pointers, kind) {
|
120
|
-
return pointers.every(pointer => pointer.device === kind);
|
120
|
+
return pointers.every((pointer) => pointer.device === kind);
|
121
121
|
}
|
122
|
-
onPointerDown({ allPointers: pointers, current: currentPointer }) {
|
122
|
+
onPointerDown({ allPointers: pointers, current: currentPointer, }) {
|
123
123
|
let handlingGesture = false;
|
124
124
|
const inertialScrollerVelocity = this.inertialScroller?.getCurrentVelocity() ?? Vec2.zero;
|
125
125
|
this.inertialScroller?.stop();
|
@@ -141,9 +141,10 @@ export default class PanZoom extends BaseTool {
|
|
141
141
|
this.isRotating = Math.abs(Math.sin(this.initialViewportRotation * 2)) > 1e-3;
|
142
142
|
handlingGesture = true;
|
143
143
|
}
|
144
|
-
else if (pointers.length === 1 &&
|
145
|
-
|
146
|
-
|
144
|
+
else if (pointers.length === 1 &&
|
145
|
+
((this.mode & PanZoomMode.OneFingerTouchGestures && allAreTouch) ||
|
146
|
+
(isRightClick && this.mode & PanZoomMode.RightClickDrags) ||
|
147
|
+
this.mode & PanZoomMode.SinglePointerGestures)) {
|
147
148
|
this.lastScreenCenter = pointers[0].screenPos;
|
148
149
|
this.isScaling = false;
|
149
150
|
handlingGesture = true;
|
@@ -197,7 +198,9 @@ export default class PanZoom extends BaseTool {
|
|
197
198
|
// `snapToMultipleOf`.
|
198
199
|
// Use a smaller snap angle if already rotated (to avoid pinch zoom gestures from
|
199
200
|
// starting rotation).
|
200
|
-
const maxSnapAngle = this.isRotating
|
201
|
+
const maxSnapAngle = this.isRotating
|
202
|
+
? this.afterRotationStartSnapAngle
|
203
|
+
: this.initialRotationSnapAngle;
|
201
204
|
// Snap the rotation
|
202
205
|
if (Math.abs(fullRotation - roundedFullRotation) < maxSnapAngle) {
|
203
206
|
fullRotation = roundedFullRotation;
|
@@ -216,7 +219,7 @@ export default class PanZoom extends BaseTool {
|
|
216
219
|
*/
|
217
220
|
toSnappedScaleFactor(touchDist) {
|
218
221
|
// scaleFactor is applied to the current transformation of the viewport.
|
219
|
-
const newScale = this.initialViewportScale * touchDist / this.startTouchDist;
|
222
|
+
const newScale = (this.initialViewportScale * touchDist) / this.startTouchDist;
|
220
223
|
const currentScale = this.editor.viewport.getScaleFactor();
|
221
224
|
const logNewScale = Math.log(newScale) / Math.log(10);
|
222
225
|
const roundedLogNewScale = Math.round(logNewScale);
|
@@ -295,10 +298,10 @@ export default class PanZoom extends BaseTool {
|
|
295
298
|
this.velocity = Vec2.zero;
|
296
299
|
};
|
297
300
|
const minInertialScrollDt = 30;
|
298
|
-
const shouldInertialScroll = event.current.device === PointerDevice.Touch
|
299
|
-
|
300
|
-
|
301
|
-
|
301
|
+
const shouldInertialScroll = event.current.device === PointerDevice.Touch &&
|
302
|
+
event.allPointers.length === 1 &&
|
303
|
+
this.velocity !== null &&
|
304
|
+
event.current.timeStamp - this.lastPointerDownTimestamp > minInertialScrollDt;
|
302
305
|
if (shouldInertialScroll && this.velocity !== null) {
|
303
306
|
const oldVelocity = this.velocity;
|
304
307
|
// If the user drags the screen, then stops, then lifts the pointer,
|
@@ -438,7 +441,9 @@ export default class PanZoom extends BaseTool {
|
|
438
441
|
translation = toCanvas.transformVec3(translation);
|
439
442
|
// Rotate/scale about the center of the canvas
|
440
443
|
const transformCenter = this.editor.viewport.visibleRect.center;
|
441
|
-
const transformUpdate = Mat33.scaling2D(scale, transformCenter)
|
444
|
+
const transformUpdate = Mat33.scaling2D(scale, transformCenter)
|
445
|
+
.rightMul(Mat33.zRotation(rotation, transformCenter))
|
446
|
+
.rightMul(Mat33.translation(translation));
|
442
447
|
this.applyAndFinalizeTransform(transformUpdate);
|
443
448
|
return true;
|
444
449
|
}
|
@@ -85,14 +85,20 @@ export default class PasteHandler extends BaseTool {
|
|
85
85
|
}
|
86
86
|
return 0;
|
87
87
|
});
|
88
|
-
const defaultTextStyle = {
|
88
|
+
const defaultTextStyle = {
|
89
|
+
size: 12,
|
90
|
+
fontFamily: 'sans',
|
91
|
+
renderingStyle: { fill: Color4.red },
|
92
|
+
};
|
89
93
|
const pastedTextStyle = textTools[0]?.getTextStyle() ?? defaultTextStyle;
|
90
94
|
// Don't paste text that would be invisible.
|
91
95
|
if (text.trim() === '') {
|
92
96
|
return;
|
93
97
|
}
|
94
98
|
const lines = text.split('\n');
|
95
|
-
await this.addComponentsFromPaste([
|
99
|
+
await this.addComponentsFromPaste([
|
100
|
+
TextComponent.fromLines(lines, Mat33.identity, pastedTextStyle),
|
101
|
+
]);
|
96
102
|
}
|
97
103
|
async doImagePaste(dataURL) {
|
98
104
|
const image = new Image();
|