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
@@ -72,7 +72,7 @@ export default class EdgeToolbar extends AbstractToolbar {
|
|
72
72
|
this.sidebarContainer.classList.add(`${toolbarCSSPrefix}tool-properties`);
|
73
73
|
this.sidebarContent = document.createElement('div');
|
74
74
|
// Setup resizing/dragging
|
75
|
-
this.sidebarY.onUpdateAndNow(y => {
|
75
|
+
this.sidebarY.onUpdateAndNow((y) => {
|
76
76
|
const belowEdgeClassName = 'dropdown-below-edge';
|
77
77
|
if (y > 0) {
|
78
78
|
this.sidebarContainer.style.transform = `translate(0, ${y}px)`;
|
@@ -89,12 +89,12 @@ export default class EdgeToolbar extends AbstractToolbar {
|
|
89
89
|
this.closeButton.classList.add('drag-elem');
|
90
90
|
// The close button has default focus -- forward its events to the main editor so that keyboard
|
91
91
|
// shortcuts still work.
|
92
|
-
this.editor.handleKeyEventsFrom(this.closeButton, event => {
|
92
|
+
this.editor.handleKeyEventsFrom(this.closeButton, (event) => {
|
93
93
|
// Don't send
|
94
94
|
return event.code !== 'Space' && event.code !== 'Enter' && event.code !== 'Tab';
|
95
95
|
});
|
96
96
|
// Close the sidebar when pressing escape
|
97
|
-
this.sidebarContainer.addEventListener('keyup', event => {
|
97
|
+
this.sidebarContainer.addEventListener('keyup', (event) => {
|
98
98
|
if (!event.defaultPrevented && event.code === 'Escape') {
|
99
99
|
this.sidebarVisible.set(false);
|
100
100
|
event.preventDefault();
|
@@ -108,7 +108,7 @@ export default class EdgeToolbar extends AbstractToolbar {
|
|
108
108
|
};
|
109
109
|
this.sidebarTitle = MutableReactiveValue.fromInitialValue('');
|
110
110
|
this.layoutManager = new EdgeToolbarLayoutManager(setSidebarContent, this.sidebarTitle, this.sidebarVisible, editor.announceForAccessibility.bind(editor), localizationTable);
|
111
|
-
this.sidebarTitle.onUpdateAndNow(title => {
|
111
|
+
this.sidebarTitle.onUpdateAndNow((title) => {
|
112
112
|
this.closeButton.setAttribute('aria-label', localizationTable.closeSidebar(title));
|
113
113
|
});
|
114
114
|
// Make things visible/keep hidden.
|
@@ -127,7 +127,7 @@ export default class EdgeToolbar extends AbstractToolbar {
|
|
127
127
|
this.menuContainer.style.opacity = '0';
|
128
128
|
}
|
129
129
|
const prefersReduceMotion = window.matchMedia?.('(prefers-reduced-motion: reduce)') ?? '';
|
130
|
-
this.sidebarVisible.onUpdate(visible => {
|
130
|
+
this.sidebarVisible.onUpdate((visible) => {
|
131
131
|
const animationProperties = `${animationDuration}ms ease`;
|
132
132
|
// We need to use different animations when reducing motion.
|
133
133
|
const reduceMotion = prefersReduceMotion.matches ? '-reduce-motion' : '';
|
@@ -138,23 +138,19 @@ export default class EdgeToolbar extends AbstractToolbar {
|
|
138
138
|
animationTimeout = null;
|
139
139
|
}
|
140
140
|
this.menuContainer.style.display = '';
|
141
|
-
this.sidebarContainer.style.animation =
|
142
|
-
|
143
|
-
this.menuContainer.style.animation =
|
144
|
-
`${animationProperties} ${toolbarCSSPrefix}-edgemenu-container-transition-in${reduceMotion}`;
|
141
|
+
this.sidebarContainer.style.animation = `${animationProperties} ${toolbarCSSPrefix}-edgemenu-transition-in${reduceMotion}`;
|
142
|
+
this.menuContainer.style.animation = `${animationProperties} ${toolbarCSSPrefix}-edgemenu-container-transition-in${reduceMotion}`;
|
145
143
|
this.menuContainer.style.opacity = '1';
|
146
144
|
// Focus the close button when first shown, but prevent scroll because the button
|
147
145
|
// is likely at the bottom of the screen (and we want the full sidebar to remain
|
148
146
|
// visible).
|
149
|
-
this.closeButton.focus({ preventScroll: true
|
147
|
+
this.closeButton.focus({ preventScroll: true });
|
150
148
|
}
|
151
149
|
else {
|
152
150
|
this.closeColorPickers();
|
153
151
|
if (animationTimeout === null) {
|
154
|
-
this.sidebarContainer.style.animation =
|
155
|
-
|
156
|
-
this.menuContainer.style.animation =
|
157
|
-
`${animationProperties} ${toolbarCSSPrefix}-edgemenu-container-transition-out${reduceMotion}`;
|
152
|
+
this.sidebarContainer.style.animation = `${animationProperties} ${toolbarCSSPrefix}-edgemenu-transition-out${reduceMotion}`;
|
153
|
+
this.menuContainer.style.animation = `${animationProperties} ${toolbarCSSPrefix}-edgemenu-container-transition-out${reduceMotion}`;
|
158
154
|
// Manually set the container's opacity to prevent flickering when closing
|
159
155
|
// the toolbar.
|
160
156
|
this.menuContainer.style.opacity = '0';
|
@@ -197,7 +193,7 @@ export default class EdgeToolbar extends AbstractToolbar {
|
|
197
193
|
break;
|
198
194
|
}
|
199
195
|
}
|
200
|
-
const perButtonPadding = Math.round(extraPadding / numVisibleButtons * 10) / 10;
|
196
|
+
const perButtonPadding = Math.round((extraPadding / numVisibleButtons) * 10) / 10;
|
201
197
|
this.toolbarToolRow.style.setProperty('--extra-left-right-padding', `${perButtonPadding}px`);
|
202
198
|
};
|
203
199
|
const actionRowBBox = this.toolbarActionRow.getBoundingClientRect();
|
@@ -566,7 +566,7 @@ class IconProvider {
|
|
566
566
|
icon.appendChild(defs);
|
567
567
|
const background = document.createElementNS(svgNamespace, 'g');
|
568
568
|
icon.appendChild(background);
|
569
|
-
renderer = new class extends SVGRenderer {
|
569
|
+
renderer = new (class extends SVGRenderer {
|
570
570
|
constructor() {
|
571
571
|
super(icon, viewport);
|
572
572
|
}
|
@@ -588,7 +588,7 @@ class IconProvider {
|
|
588
588
|
}
|
589
589
|
return addedPath;
|
590
590
|
}
|
591
|
-
}();
|
591
|
+
})();
|
592
592
|
}
|
593
593
|
else {
|
594
594
|
renderer = new SVGRenderer(icon, viewport);
|
@@ -855,7 +855,9 @@ class IconProvider {
|
|
855
855
|
return penStyle.factory === makePolylineBuilder;
|
856
856
|
}
|
857
857
|
/** Must be overridden by icon packs that need attribution. */
|
858
|
-
licenseInfo() {
|
858
|
+
licenseInfo() {
|
859
|
+
return null;
|
860
|
+
}
|
859
861
|
}
|
860
862
|
_IconProvider_instances = new WeakSet(), _IconProvider_makeXIcon = function _IconProvider_makeXIcon() {
|
861
863
|
const strokeWidth = '6px';
|
@@ -62,7 +62,7 @@ export const defaultToolbarLocalization = {
|
|
62
62
|
fileInput__andNMoreFiles: (n) => `(...${n} more)`,
|
63
63
|
// Help text
|
64
64
|
penDropdown__baseHelpText: 'This tool draws shapes or freehand lines.',
|
65
|
-
penDropdown__colorHelpText:
|
65
|
+
penDropdown__colorHelpText: "Changes the pen's color",
|
66
66
|
penDropdown__thicknessHelpText: 'Changes the thickness of strokes drawn by the pen.',
|
67
67
|
penDropdown__penTypeHelpText: 'Changes the pen style.\n\nEither a “pen” style or “shape” can be chosen. Choosing a “pen” style draws freehand lines. Choosing a “shape” draws shapes.',
|
68
68
|
penDropdown__autocorrectHelpText: 'Converts approximate freehand lines and rectangles to perfect ones.\n\nThe pen must be held stationary at the end of a stroke to trigger a correction.',
|
@@ -78,11 +78,11 @@ export const defaultToolbarLocalization = {
|
|
78
78
|
eraserDropdown__thicknessHelpText: 'Changes the size of the eraser.',
|
79
79
|
eraserDropdown__fullStrokeEraserHelpText: 'When in full-stroke mode, entire shapes are erased.\n\nWhen not in full-stroke mode, shapes can be partially erased.',
|
80
80
|
selectionDropdown__baseHelpText: 'Selects content and manipulates the selection',
|
81
|
-
selectionDropdown__resizeToHelpText:
|
81
|
+
selectionDropdown__resizeToHelpText: "Crops the drawing to the size of what's currently selected.\n\nIf auto-resize is enabled, it will be disabled.",
|
82
82
|
selectionDropdown__deleteHelpText: 'Erases selected items.',
|
83
83
|
selectionDropdown__duplicateHelpText: 'Makes a copy of selected items.',
|
84
84
|
selectionDropdown__changeColorHelpText: 'Changes the color of selected items.',
|
85
|
-
pageDropdown__baseHelpText:
|
85
|
+
pageDropdown__baseHelpText: "Controls the drawing canvas' background color, pattern, and size.",
|
86
86
|
pageDropdown__backgroundColorHelpText: 'Changes the background color of the drawing canvas.',
|
87
87
|
pageDropdown__gridCheckboxHelpText: 'Enables/disables a background grid pattern.',
|
88
88
|
pageDropdown__autoresizeCheckboxHelpText: 'When checked, the page grows to fit the drawing.\n\nWhen unchecked, the page is visible and its size can be set manually.',
|
@@ -41,7 +41,7 @@ const createHelpPage = (helpItems, onItemClick, onBackgroundClick, context) => {
|
|
41
41
|
let clonedElementContainers = [];
|
42
42
|
// Clicking on the background of the help area should send an event (e.g. to allow the
|
43
43
|
// help container to be closed).
|
44
|
-
container.addEventListener('click', event => {
|
44
|
+
container.addEventListener('click', (event) => {
|
45
45
|
// If clicking directly on the container (and not on a child)
|
46
46
|
if (event.target === container) {
|
47
47
|
onBackgroundClick();
|
@@ -53,7 +53,7 @@ const createHelpPage = (helpItems, onItemClick, onBackgroundClick, context) => {
|
|
53
53
|
if (!currentItem) {
|
54
54
|
return Rect2.empty;
|
55
55
|
}
|
56
|
-
const itemBoundingBoxes = currentItem.targetElements.map(element => Rect2.of(element.getBoundingClientRect()));
|
56
|
+
const itemBoundingBoxes = currentItem.targetElements.map((element) => Rect2.of(element.getBoundingClientRect()));
|
57
57
|
return Rect2.union(...itemBoundingBoxes);
|
58
58
|
};
|
59
59
|
// Updates each cloned element's click listener and CSS classes based on whether
|
@@ -218,7 +218,9 @@ class HelpDisplay {
|
|
218
218
|
const label = this.context.localization.close;
|
219
219
|
closeButton.setAttribute('aria-label', label);
|
220
220
|
closeButton.setAttribute('title', label);
|
221
|
-
closeButton.onclick = () => {
|
221
|
+
closeButton.onclick = () => {
|
222
|
+
closeOverlay();
|
223
|
+
};
|
222
224
|
return closeButton;
|
223
225
|
};
|
224
226
|
// Wraps the label and clickable help elements
|
@@ -226,7 +228,7 @@ class HelpDisplay {
|
|
226
228
|
const currentPage = MutableReactiveValue.fromInitialValue(0);
|
227
229
|
const content = document.createElement('div');
|
228
230
|
content.classList.add('navigation-content');
|
229
|
-
const helpPage = createHelpPage(__classPrivateFieldGet(this, _HelpDisplay_helpData, "f"), newPageIndex => currentPage.set(newPageIndex), onBackgroundClick, this.context);
|
231
|
+
const helpPage = createHelpPage(__classPrivateFieldGet(this, _HelpDisplay_helpData, "f"), (newPageIndex) => currentPage.set(newPageIndex), onBackgroundClick, this.context);
|
230
232
|
helpPage.addToParent(content);
|
231
233
|
const showPage = (pageIndex) => {
|
232
234
|
if (pageIndex >= __classPrivateFieldGet(this, _HelpDisplay_helpData, "f").length || pageIndex < 0) {
|
@@ -375,12 +377,12 @@ class HelpDisplay {
|
|
375
377
|
// Close the overlay when clicking on the background (*directly* on any of the
|
376
378
|
// elements in closeOverlayTriggers).
|
377
379
|
const closeOverlayTriggers = [navigation.content, navigationButtons, overlay];
|
378
|
-
overlay.onclick = event => {
|
380
|
+
overlay.onclick = (event) => {
|
379
381
|
if (closeOverlayTriggers.includes(event.target)) {
|
380
382
|
onBackgroundClick();
|
381
383
|
}
|
382
384
|
};
|
383
|
-
overlay.onkeyup = event => {
|
385
|
+
overlay.onkeyup = (event) => {
|
384
386
|
if (event.code === 'Escape') {
|
385
387
|
closeOverlay();
|
386
388
|
event.preventDefault();
|
@@ -1,9 +1,6 @@
|
|
1
1
|
import { Vec2 } from '@js-draw/math';
|
2
2
|
const makeDraggable = (dragElement, options) => {
|
3
|
-
const dragElements = [
|
4
|
-
...options.draggableChildElements,
|
5
|
-
dragElement,
|
6
|
-
];
|
3
|
+
const dragElements = [...options.draggableChildElements, dragElement];
|
7
4
|
let lastX = 0;
|
8
5
|
let lastY = 0;
|
9
6
|
let startX = 0;
|
@@ -49,7 +46,7 @@ const makeDraggable = (dragElement, options) => {
|
|
49
46
|
return Math.hypot(lastX - startX, lastY - startY) < clickThreshold;
|
50
47
|
};
|
51
48
|
let startedDragging = false;
|
52
|
-
addEventListener('pointerdown', event => {
|
49
|
+
addEventListener('pointerdown', (event) => {
|
53
50
|
if (event.defaultPrevented || !isDraggableElement(event.target)) {
|
54
51
|
return;
|
55
52
|
}
|
@@ -80,7 +77,7 @@ const makeDraggable = (dragElement, options) => {
|
|
80
77
|
pointerDown = false;
|
81
78
|
startedDragging = false;
|
82
79
|
};
|
83
|
-
addEventListener('pointermove', event => {
|
80
|
+
addEventListener('pointermove', (event) => {
|
84
81
|
if (!event.isPrimary || !pointerDown) {
|
85
82
|
return undefined;
|
86
83
|
}
|
@@ -108,7 +105,7 @@ const makeDraggable = (dragElement, options) => {
|
|
108
105
|
startedDragging = true;
|
109
106
|
}
|
110
107
|
});
|
111
|
-
addEventListener('pointerleave', event => {
|
108
|
+
addEventListener('pointerleave', (event) => {
|
112
109
|
// Capture the pointer if it exits the container while dragging.
|
113
110
|
if (capturedPointerId === null && pointerDown && event.isPrimary) {
|
114
111
|
dragElement.setPointerCapture(event.pointerId);
|
@@ -2,13 +2,14 @@ import BaseWidget from './BaseWidget.mjs';
|
|
2
2
|
import { toolbarCSSPrefix } from '../constants.mjs';
|
3
3
|
const isToolWidgetFocused = () => {
|
4
4
|
const currentFocus = [...document.querySelectorAll('*:focus')];
|
5
|
-
return currentFocus.length &&
|
5
|
+
return (currentFocus.length &&
|
6
|
+
currentFocus.some((elem) => elem.classList.contains(`${toolbarCSSPrefix}button`)));
|
6
7
|
};
|
7
8
|
export default class BaseToolWidget extends BaseWidget {
|
8
9
|
constructor(editor, targetTool, id, localizationTable) {
|
9
10
|
super(editor, id, localizationTable);
|
10
11
|
this.targetTool = targetTool;
|
11
|
-
this.targetTool.enabledValue().onUpdateAndNow(enabled => {
|
12
|
+
this.targetTool.enabledValue().onUpdateAndNow((enabled) => {
|
12
13
|
if (enabled) {
|
13
14
|
this.setSelected(true);
|
14
15
|
// Transfer focus to the current button, only if another toolbar button is
|
@@ -11,7 +11,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
11
11
|
};
|
12
12
|
var _BaseWidget_instances, _a, _BaseWidget_hasDropdown, _BaseWidget_disabledDueToReadOnlyEditor, _BaseWidget_tags, _BaseWidget_removeEditorListeners, _BaseWidget_addEditorListeners;
|
13
13
|
import ToolbarShortcutHandler from '../../tools/ToolbarShortcutHandler.mjs';
|
14
|
-
import { keyPressEventFromHTMLEvent, keyUpEventFromHTMLEvent } from '../../inputEvents.mjs';
|
14
|
+
import { keyPressEventFromHTMLEvent, keyUpEventFromHTMLEvent, } from '../../inputEvents.mjs';
|
15
15
|
import { toolbarCSSPrefix } from '../constants.mjs';
|
16
16
|
import DropdownLayoutManager from './layout/DropdownLayoutManager.mjs';
|
17
17
|
import addLongPressOrHoverCssClasses from '../../util/addLongPressOrHoverCssClasses.mjs';
|
@@ -67,7 +67,7 @@ class BaseWidget {
|
|
67
67
|
this.button.tabIndex = 0;
|
68
68
|
// Disable the context menu. This allows long-press gestures to trigger the button's
|
69
69
|
// tooltip instead.
|
70
|
-
this.button.oncontextmenu = event => {
|
70
|
+
this.button.oncontextmenu = (event) => {
|
71
71
|
event.preventDefault();
|
72
72
|
};
|
73
73
|
addLongPressOrHoverCssClasses(this.button);
|
@@ -165,7 +165,7 @@ class BaseWidget {
|
|
165
165
|
return this.setUpButtonEventListeners(button);
|
166
166
|
}
|
167
167
|
setUpButtonEventListeners(button) {
|
168
|
-
const clickTriggers = { Enter: true, ' ': true
|
168
|
+
const clickTriggers = { Enter: true, ' ': true };
|
169
169
|
button.onkeydown = (evt) => {
|
170
170
|
let handled = false;
|
171
171
|
if (evt.key in clickTriggers) {
|
@@ -183,7 +183,7 @@ class BaseWidget {
|
|
183
183
|
evt.preventDefault();
|
184
184
|
}
|
185
185
|
};
|
186
|
-
button.onkeyup = htmlEvent => {
|
186
|
+
button.onkeyup = (htmlEvent) => {
|
187
187
|
if (htmlEvent.key in clickTriggers) {
|
188
188
|
return;
|
189
189
|
}
|
@@ -199,7 +199,7 @@ class BaseWidget {
|
|
199
199
|
}
|
200
200
|
};
|
201
201
|
// Prevent double-click zoom on some devices.
|
202
|
-
button.ondblclick = event => {
|
202
|
+
button.ondblclick = (event) => {
|
203
203
|
event.preventDefault();
|
204
204
|
};
|
205
205
|
}
|
@@ -251,7 +251,7 @@ class BaseWidget {
|
|
251
251
|
this.container.replaceChildren();
|
252
252
|
this.button.replaceChildren(this.icon, this.label);
|
253
253
|
this.container.appendChild(this.button);
|
254
|
-
const helpDisplay = new HelpDisplay(content => this.editor.createHTMLOverlay(content), this.editor);
|
254
|
+
const helpDisplay = new HelpDisplay((content) => this.editor.createHTMLOverlay(content), this.editor);
|
255
255
|
const helpText = this.getHelpText();
|
256
256
|
if (helpText) {
|
257
257
|
helpDisplay.registerTextHelpForElement(this.dropdownContent, [this.getTitle(), helpText].join('\n\n'));
|
@@ -271,7 +271,7 @@ class BaseWidget {
|
|
271
271
|
getTitle: () => this.getTitle(),
|
272
272
|
isToplevel: () => this.toplevel,
|
273
273
|
});
|
274
|
-
this.dropdown.visible.onUpdate(visible => {
|
274
|
+
this.dropdown.visible.onUpdate((visible) => {
|
275
275
|
if (visible) {
|
276
276
|
this.container.classList.add('dropdownVisible');
|
277
277
|
}
|
@@ -469,7 +469,7 @@ _a = BaseWidget, _BaseWidget_hasDropdown = new WeakMap(), _BaseWidget_disabledDu
|
|
469
469
|
handler.removeListener(keyPressListener);
|
470
470
|
};
|
471
471
|
}
|
472
|
-
const readOnlyListener = this.editor.isReadOnlyReactiveValue().onUpdateAndNow(readOnly => {
|
472
|
+
const readOnlyListener = this.editor.isReadOnlyReactiveValue().onUpdateAndNow((readOnly) => {
|
473
473
|
if (readOnly && this.shouldAutoDisableInReadOnlyEditor() && !this.disabled) {
|
474
474
|
this.setDisabled(true);
|
475
475
|
__classPrivateFieldSet(this, _BaseWidget_disabledDueToReadOnlyEditor, true, "f");
|
@@ -101,7 +101,7 @@ class DocumentPropertiesWidget extends BaseWidget {
|
|
101
101
|
const backgroundColorRow = document.createElement('div');
|
102
102
|
const backgroundColorLabel = document.createElement('label');
|
103
103
|
backgroundColorLabel.innerText = this.localizationTable.backgroundColor;
|
104
|
-
const { input: colorInput, container: backgroundColorInputContainer, setValue: setBgColorInputValue, registerWithHelpTextDisplay: registerHelpForInputs, } = makeColorInput(this.editor, color => {
|
104
|
+
const { input: colorInput, container: backgroundColorInputContainer, setValue: setBgColorInputValue, registerWithHelpTextDisplay: registerHelpForInputs, } = makeColorInput(this.editor, (color) => {
|
105
105
|
if (!color.eq(this.getBackgroundColor())) {
|
106
106
|
this.setBackgroundColor(color);
|
107
107
|
}
|
@@ -116,7 +116,7 @@ class DocumentPropertiesWidget extends BaseWidget {
|
|
116
116
|
helpDisplay?.registerTextHelpForElement(backgroundColorRow, this.localizationTable.pageDropdown__backgroundColorHelpText);
|
117
117
|
registerHelpForInputs(helpDisplay);
|
118
118
|
};
|
119
|
-
return { setBgColorInputValue, backgroundColorRow, registerWithHelp
|
119
|
+
return { setBgColorInputValue, backgroundColorRow, registerWithHelp };
|
120
120
|
};
|
121
121
|
const { backgroundColorRow, setBgColorInputValue, registerWithHelp: registerBackgroundRowWithHelp, } = makeBackgroundColorInput();
|
122
122
|
const makeCheckboxRow = (labelText, onChange) => {
|
@@ -8,7 +8,7 @@ class EraserToolWidget extends BaseToolWidget {
|
|
8
8
|
super(editor, tool, 'eraser-tool-widget', localizationTable);
|
9
9
|
this.tool = tool;
|
10
10
|
this.updateInputs = () => { };
|
11
|
-
this.editor.notifier.on(EditorEventType.ToolUpdated, toolEvt => {
|
11
|
+
this.editor.notifier.on(EditorEventType.ToolUpdated, (toolEvt) => {
|
12
12
|
if (toolEvt.kind === EditorEventType.ToolUpdated && toolEvt.tool === this.tool) {
|
13
13
|
this.updateInputs();
|
14
14
|
this.updateIcon();
|
@@ -36,7 +36,9 @@ class EraserToolWidget extends BaseToolWidget {
|
|
36
36
|
labelElement.innerText = this.localizationTable.fullStrokeEraser;
|
37
37
|
checkboxElement.type = 'checkbox';
|
38
38
|
checkboxElement.oninput = () => {
|
39
|
-
this.tool
|
39
|
+
this.tool
|
40
|
+
.getModeValue()
|
41
|
+
.set(checkboxElement.checked ? EraserMode.FullStroke : EraserMode.PartialStroke);
|
40
42
|
};
|
41
43
|
const updateValue = () => {
|
42
44
|
checkboxElement.checked = this.tool.getModeValue().get() === EraserMode.FullStroke;
|
@@ -53,7 +55,7 @@ class EraserToolWidget extends BaseToolWidget {
|
|
53
55
|
fillDropdown(dropdown, helpDisplay) {
|
54
56
|
const container = document.createElement('div');
|
55
57
|
container.classList.add(`${toolbarCSSPrefix}spacedList`, `${toolbarCSSPrefix}nonbutton-controls-main-list`);
|
56
|
-
const thicknessSlider = makeThicknessSlider(this.editor, thickness => {
|
58
|
+
const thicknessSlider = makeThicknessSlider(this.editor, (thickness) => {
|
57
59
|
this.tool.setThickness(thickness);
|
58
60
|
});
|
59
61
|
thicknessSlider.setBounds(10, 55);
|
@@ -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);
|