js-draw 1.17.0 → 1.19.1
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +70 -10
- package/dist/Editor.css +35 -3
- package/dist/bundle.js +2 -2
- package/dist/bundledStyles.js +1 -1
- package/dist/cjs/Editor.d.ts +38 -21
- package/dist/cjs/Editor.js +11 -2
- package/dist/cjs/{SVGLoader.d.ts → SVGLoader/index.d.ts} +1 -1
- package/dist/cjs/{SVGLoader.js → SVGLoader/index.js} +12 -29
- package/dist/cjs/SVGLoader/utils/determineFontSize.d.ts +3 -0
- package/dist/cjs/SVGLoader/utils/determineFontSize.js +27 -0
- package/dist/cjs/Viewport.d.ts +33 -1
- package/dist/cjs/components/AbstractComponent.d.ts +17 -5
- package/dist/cjs/components/AbstractComponent.js +15 -15
- package/dist/cjs/components/Stroke.d.ts +4 -1
- package/dist/cjs/components/Stroke.js +158 -2
- package/dist/cjs/components/TextComponent.js +3 -1
- package/dist/cjs/components/builders/PolylineBuilder.d.ts +1 -1
- package/dist/cjs/components/builders/PolylineBuilder.js +9 -2
- package/dist/cjs/components/builders/PressureSensitiveFreehandLineBuilder.d.ts +1 -1
- package/dist/cjs/components/builders/PressureSensitiveFreehandLineBuilder.js +44 -51
- package/dist/cjs/image/EditorImage.js +1 -1
- package/dist/cjs/localizations/de.js +1 -1
- package/dist/cjs/localizations/es.js +1 -1
- package/dist/cjs/rendering/caching/RenderingCacheNode.js +20 -15
- package/dist/cjs/testing/createEditor.d.ts +2 -2
- package/dist/cjs/testing/createEditor.js +2 -2
- package/dist/cjs/testing/findNodeWithText.d.ts +3 -0
- package/dist/cjs/testing/findNodeWithText.js +16 -0
- package/dist/cjs/testing/firstElementAncestorOfNode.d.ts +3 -0
- package/dist/cjs/testing/firstElementAncestorOfNode.js +13 -0
- package/dist/cjs/testing/sendKeyPressRelease.d.ts +3 -0
- package/dist/cjs/testing/sendKeyPressRelease.js +8 -0
- package/dist/cjs/testing/sendPenEvent.d.ts +2 -2
- package/dist/cjs/testing/sendPenEvent.js +26 -3
- package/dist/cjs/toolbar/IconProvider.d.ts +3 -1
- package/dist/cjs/toolbar/IconProvider.js +15 -3
- package/dist/cjs/toolbar/localization.d.ts +8 -1
- package/dist/cjs/toolbar/localization.js +9 -2
- package/dist/cjs/toolbar/widgets/BaseWidget.d.ts +1 -0
- package/dist/cjs/toolbar/widgets/BaseWidget.js +1 -0
- package/dist/cjs/toolbar/widgets/EraserToolWidget.d.ts +6 -1
- package/dist/cjs/toolbar/widgets/EraserToolWidget.js +45 -5
- package/dist/cjs/toolbar/widgets/InsertImageWidget/ImageWrapper.d.ts +22 -0
- package/dist/cjs/toolbar/widgets/InsertImageWidget/ImageWrapper.js +58 -0
- package/dist/cjs/toolbar/widgets/InsertImageWidget/fileToImages.d.ts +3 -0
- package/dist/cjs/toolbar/widgets/InsertImageWidget/fileToImages.js +21 -0
- package/dist/cjs/toolbar/widgets/InsertImageWidget/index.d.ts +37 -0
- package/dist/cjs/toolbar/widgets/InsertImageWidget/index.js +281 -0
- package/dist/cjs/toolbar/widgets/PenToolWidget.js +10 -3
- package/dist/cjs/toolbar/widgets/PenToolWidget.test.d.ts +1 -0
- package/dist/cjs/toolbar/widgets/TextToolWidget.js +5 -3
- package/dist/cjs/toolbar/widgets/TextToolWidget.test.d.ts +1 -0
- package/dist/cjs/toolbar/widgets/components/makeFileInput.d.ts +12 -2
- package/dist/cjs/toolbar/widgets/components/makeFileInput.js +102 -45
- package/dist/cjs/toolbar/widgets/components/makeFileInput.test.d.ts +1 -0
- package/dist/cjs/toolbar/widgets/components/makeSnappedList.d.ts +15 -0
- package/dist/cjs/toolbar/widgets/components/makeSnappedList.js +103 -0
- package/dist/cjs/toolbar/widgets/keybindings.js +1 -1
- package/dist/cjs/tools/Eraser.d.ts +31 -6
- package/dist/cjs/tools/Eraser.js +161 -21
- package/dist/cjs/tools/PasteHandler.js +0 -1
- package/dist/cjs/tools/SelectionTool/Selection.d.ts +2 -2
- package/dist/cjs/tools/SelectionTool/Selection.js +20 -20
- package/dist/cjs/tools/SelectionTool/SelectionHandle.d.ts +8 -2
- package/dist/cjs/tools/SelectionTool/SelectionHandle.js +6 -0
- package/dist/cjs/tools/SelectionTool/SelectionTool.js +1 -1
- package/dist/cjs/tools/SelectionTool/types.d.ts +19 -0
- package/dist/cjs/tools/TextTool.js +2 -1
- package/dist/cjs/tools/TextTool.test.d.ts +1 -0
- package/dist/cjs/tools/ToolController.d.ts +2 -0
- package/dist/cjs/tools/ToolController.js +10 -1
- package/dist/cjs/tools/lib.d.ts +1 -4
- package/dist/cjs/tools/lib.js +2 -4
- package/dist/cjs/util/ReactiveValue.d.ts +2 -0
- package/dist/cjs/util/ReactiveValue.js +11 -0
- package/dist/cjs/util/bytesToSizeString.d.ts +8 -0
- package/dist/cjs/util/bytesToSizeString.js +26 -0
- package/dist/cjs/util/bytesToSizeString.test.d.ts +1 -0
- package/dist/cjs/util/stopPropagationOfScrollingWheelEvents.js +10 -6
- package/dist/cjs/util/waitForAll.d.ts +2 -0
- package/dist/cjs/util/waitForAll.js +2 -0
- package/dist/cjs/util/waitForImageLoaded.js +3 -0
- package/dist/cjs/util/waitForTimeout.d.ts +1 -0
- package/dist/cjs/util/waitForTimeout.js +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/mjs/Editor.d.ts +38 -21
- package/dist/mjs/Editor.mjs +11 -2
- package/dist/mjs/{SVGLoader.d.ts → SVGLoader/index.d.ts} +1 -1
- package/dist/mjs/{SVGLoader.mjs → SVGLoader/index.mjs} +12 -29
- package/dist/mjs/SVGLoader/index.test.d.ts +1 -0
- package/dist/mjs/SVGLoader/utils/determineFontSize.d.ts +3 -0
- package/dist/mjs/SVGLoader/utils/determineFontSize.mjs +25 -0
- package/dist/mjs/Viewport.d.ts +33 -1
- package/dist/mjs/components/AbstractComponent.d.ts +17 -5
- package/dist/mjs/components/AbstractComponent.mjs +15 -15
- package/dist/mjs/components/Stroke.d.ts +4 -1
- package/dist/mjs/components/Stroke.mjs +159 -3
- package/dist/mjs/components/TextComponent.mjs +3 -1
- package/dist/mjs/components/builders/PolylineBuilder.d.ts +1 -1
- package/dist/mjs/components/builders/PolylineBuilder.mjs +10 -3
- package/dist/mjs/components/builders/PressureSensitiveFreehandLineBuilder.d.ts +1 -1
- package/dist/mjs/components/builders/PressureSensitiveFreehandLineBuilder.mjs +45 -52
- package/dist/mjs/image/EditorImage.mjs +1 -1
- package/dist/mjs/localizations/de.mjs +1 -1
- package/dist/mjs/localizations/es.mjs +1 -1
- package/dist/mjs/rendering/caching/RenderingCacheNode.mjs +20 -15
- package/dist/mjs/testing/createEditor.d.ts +2 -2
- package/dist/mjs/testing/createEditor.mjs +2 -2
- package/dist/mjs/testing/findNodeWithText.d.ts +3 -0
- package/dist/mjs/testing/findNodeWithText.mjs +14 -0
- package/dist/mjs/testing/firstElementAncestorOfNode.d.ts +3 -0
- package/dist/mjs/testing/firstElementAncestorOfNode.mjs +11 -0
- package/dist/mjs/testing/sendKeyPressRelease.d.ts +3 -0
- package/dist/mjs/testing/sendKeyPressRelease.mjs +6 -0
- package/dist/mjs/testing/sendPenEvent.d.ts +2 -2
- package/dist/mjs/testing/sendPenEvent.mjs +3 -3
- package/dist/mjs/toolbar/IconProvider.d.ts +3 -1
- package/dist/mjs/toolbar/IconProvider.mjs +15 -3
- package/dist/mjs/toolbar/localization.d.ts +8 -1
- package/dist/mjs/toolbar/localization.mjs +9 -2
- package/dist/mjs/toolbar/widgets/BaseWidget.d.ts +1 -0
- package/dist/mjs/toolbar/widgets/BaseWidget.mjs +1 -0
- package/dist/mjs/toolbar/widgets/EraserToolWidget.d.ts +6 -1
- package/dist/mjs/toolbar/widgets/EraserToolWidget.mjs +47 -6
- package/dist/mjs/toolbar/widgets/InsertImageWidget/ImageWrapper.d.ts +22 -0
- package/dist/mjs/toolbar/widgets/InsertImageWidget/ImageWrapper.mjs +54 -0
- package/dist/mjs/toolbar/widgets/InsertImageWidget/fileToImages.d.ts +3 -0
- package/dist/mjs/toolbar/widgets/InsertImageWidget/fileToImages.mjs +16 -0
- package/dist/mjs/toolbar/widgets/InsertImageWidget/index.d.ts +37 -0
- package/dist/mjs/toolbar/widgets/InsertImageWidget/index.mjs +276 -0
- package/dist/mjs/toolbar/widgets/InsertImageWidget/index.test.d.ts +1 -0
- package/dist/mjs/toolbar/widgets/PenToolWidget.mjs +10 -3
- package/dist/mjs/toolbar/widgets/PenToolWidget.test.d.ts +1 -0
- package/dist/mjs/toolbar/widgets/TextToolWidget.mjs +5 -3
- package/dist/mjs/toolbar/widgets/TextToolWidget.test.d.ts +1 -0
- package/dist/mjs/toolbar/widgets/components/makeFileInput.d.ts +12 -2
- package/dist/mjs/toolbar/widgets/components/makeFileInput.mjs +102 -45
- package/dist/mjs/toolbar/widgets/components/makeFileInput.test.d.ts +1 -0
- package/dist/mjs/toolbar/widgets/components/makeSnappedList.d.ts +15 -0
- package/dist/mjs/toolbar/widgets/components/makeSnappedList.mjs +98 -0
- package/dist/mjs/toolbar/widgets/keybindings.mjs +1 -1
- package/dist/mjs/tools/Eraser.d.ts +31 -6
- package/dist/mjs/tools/Eraser.mjs +161 -22
- package/dist/mjs/tools/PasteHandler.mjs +0 -1
- package/dist/mjs/tools/SelectionTool/Selection.d.ts +2 -2
- package/dist/mjs/tools/SelectionTool/Selection.mjs +20 -20
- package/dist/mjs/tools/SelectionTool/SelectionHandle.d.ts +8 -2
- package/dist/mjs/tools/SelectionTool/SelectionHandle.mjs +6 -0
- package/dist/mjs/tools/SelectionTool/SelectionTool.mjs +1 -1
- package/dist/mjs/tools/SelectionTool/types.d.ts +19 -0
- package/dist/mjs/tools/TextTool.mjs +2 -1
- package/dist/mjs/tools/TextTool.test.d.ts +1 -0
- package/dist/mjs/tools/ToolController.d.ts +2 -0
- package/dist/mjs/tools/ToolController.mjs +10 -1
- package/dist/mjs/tools/lib.d.ts +1 -4
- package/dist/mjs/tools/lib.mjs +1 -4
- package/dist/mjs/util/ReactiveValue.d.ts +2 -0
- package/dist/mjs/util/ReactiveValue.mjs +11 -0
- package/dist/mjs/util/bytesToSizeString.d.ts +8 -0
- package/dist/mjs/util/bytesToSizeString.mjs +24 -0
- package/dist/mjs/util/bytesToSizeString.test.d.ts +1 -0
- package/dist/mjs/util/stopPropagationOfScrollingWheelEvents.mjs +10 -6
- package/dist/mjs/util/waitForAll.d.ts +2 -0
- package/dist/mjs/util/waitForAll.mjs +2 -0
- package/dist/mjs/util/waitForImageLoaded.mjs +3 -0
- package/dist/mjs/util/waitForTimeout.d.ts +1 -0
- package/dist/mjs/util/waitForTimeout.mjs +1 -1
- package/dist/mjs/version.mjs +1 -1
- package/package.json +4 -4
- package/src/toolbar/toolbar.scss +1 -7
- package/src/toolbar/widgets/{InsertImageWidget.scss → InsertImageWidget/index.scss} +3 -2
- package/src/toolbar/widgets/components/components.scss +2 -1
- package/src/toolbar/widgets/components/makeFileInput.scss +14 -1
- package/src/toolbar/widgets/components/makeSnappedList.scss +28 -0
- package/src/toolbar/widgets/widgets.scss +7 -0
- package/dist/cjs/toolbar/widgets/InsertImageWidget.d.ts +0 -22
- package/dist/cjs/toolbar/widgets/InsertImageWidget.js +0 -269
- package/dist/mjs/toolbar/widgets/InsertImageWidget.d.ts +0 -22
- package/dist/mjs/toolbar/widgets/InsertImageWidget.mjs +0 -264
- /package/dist/cjs/{SVGLoader.test.d.ts → SVGLoader/index.test.d.ts} +0 -0
- /package/dist/{mjs/SVGLoader.test.d.ts → cjs/toolbar/widgets/InsertImageWidget/index.test.d.ts} +0 -0
@@ -0,0 +1,8 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
const inputEvents_1 = require("../inputEvents");
|
4
|
+
const sendKeyPressRelease = (editor, key) => {
|
5
|
+
editor.sendKeyboardEvent(inputEvents_1.InputEvtType.KeyPressEvent, key);
|
6
|
+
editor.sendKeyboardEvent(inputEvents_1.InputEvtType.KeyUpEvent, key);
|
7
|
+
};
|
8
|
+
exports.default = sendKeyPressRelease;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import Editor from '../Editor';
|
2
2
|
import { Point2 } from '@js-draw/math';
|
3
|
-
import Pointer from '../Pointer';
|
3
|
+
import Pointer, { PointerDevice } from '../Pointer';
|
4
4
|
import { InputEvtType } from '../inputEvents';
|
5
5
|
/**
|
6
6
|
* Dispatch a pen event to the currently selected tool.
|
@@ -8,5 +8,5 @@ import { InputEvtType } from '../inputEvents';
|
|
8
8
|
*
|
9
9
|
* @see {@link sendTouchEvent}
|
10
10
|
*/
|
11
|
-
declare const sendPenEvent: (editor: Editor, eventType: InputEvtType.PointerDownEvt | InputEvtType.PointerMoveEvt | InputEvtType.PointerUpEvt, point: Point2, allPointers?: Pointer[]) => Pointer;
|
11
|
+
declare const sendPenEvent: (editor: Editor, eventType: InputEvtType.PointerDownEvt | InputEvtType.PointerMoveEvt | InputEvtType.PointerUpEvt, point: Point2, allPointers?: Pointer[], deviceType?: PointerDevice) => Pointer;
|
12
12
|
export default sendPenEvent;
|
@@ -1,9 +1,32 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
+
if (mod && mod.__esModule) return mod;
|
20
|
+
var result = {};
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
+
__setModuleDefault(result, mod);
|
23
|
+
return result;
|
24
|
+
};
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
27
|
};
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
const Pointer_1 =
|
29
|
+
const Pointer_1 = __importStar(require("../Pointer"));
|
7
30
|
const inputEvents_1 = require("../inputEvents");
|
8
31
|
const getUniquePointerId_1 = __importDefault(require("./getUniquePointerId"));
|
9
32
|
/**
|
@@ -12,9 +35,9 @@ const getUniquePointerId_1 = __importDefault(require("./getUniquePointerId"));
|
|
12
35
|
*
|
13
36
|
* @see {@link sendTouchEvent}
|
14
37
|
*/
|
15
|
-
const sendPenEvent = (editor, eventType, point, allPointers) => {
|
38
|
+
const sendPenEvent = (editor, eventType, point, allPointers, deviceType = Pointer_1.PointerDevice.Pen) => {
|
16
39
|
const id = (0, getUniquePointerId_1.default)(allPointers ?? []);
|
17
|
-
const mainPointer = Pointer_1.default.ofCanvasPoint(point, eventType !== inputEvents_1.InputEvtType.PointerUpEvt, editor.viewport, id);
|
40
|
+
const mainPointer = Pointer_1.default.ofCanvasPoint(point, eventType !== inputEvents_1.InputEvtType.PointerUpEvt, editor.viewport, id, deviceType);
|
18
41
|
editor.toolController.dispatchInputEvent({
|
19
42
|
kind: eventType,
|
20
43
|
allPointers: allPointers ?? [
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import { Color4 } from '@js-draw/math';
|
2
2
|
import TextRenderingStyle from '../rendering/TextRenderingStyle';
|
3
3
|
import { PenStyle } from '../tools/Pen';
|
4
|
+
import { EraserMode } from '../tools/Eraser';
|
4
5
|
export type IconElemType = HTMLImageElement | SVGElement;
|
5
6
|
/**
|
6
7
|
* Provides icons that can be used in the toolbar and other locations.
|
@@ -39,7 +40,7 @@ export default class IconProvider {
|
|
39
40
|
makeUndoIcon(): IconElemType;
|
40
41
|
makeRedoIcon(): IconElemType;
|
41
42
|
makeDropdownIcon(): IconElemType;
|
42
|
-
makeEraserIcon(eraserSize?: number): IconElemType;
|
43
|
+
makeEraserIcon(eraserSize?: number, mode?: EraserMode): IconElemType;
|
43
44
|
makeSelectionIcon(): IconElemType;
|
44
45
|
makeRotateIcon(): IconElemType;
|
45
46
|
makeHandToolIcon(): IconElemType;
|
@@ -88,6 +89,7 @@ export default class IconProvider {
|
|
88
89
|
* @returns true if the given `penStyle` is known to match a rounded tip type of pen.
|
89
90
|
*/
|
90
91
|
protected isRoundedTipPen(penStyle: PenStyle): boolean;
|
92
|
+
protected isPolylinePen(penStyle: PenStyle): boolean;
|
91
93
|
/** Must be overridden by icon packs that need attribution. */
|
92
94
|
licenseInfo(): string | null;
|
93
95
|
}
|
@@ -13,6 +13,8 @@ const math_1 = require("@js-draw/math");
|
|
13
13
|
const SVGRenderer_1 = __importDefault(require("../rendering/renderers/SVGRenderer"));
|
14
14
|
const Viewport_1 = __importDefault(require("../Viewport"));
|
15
15
|
const FreehandLineBuilder_1 = require("../components/builders/FreehandLineBuilder");
|
16
|
+
const PolylineBuilder_1 = require("../components/builders/PolylineBuilder");
|
17
|
+
const Eraser_1 = require("../tools/Eraser");
|
16
18
|
const svgNamespace = 'http://www.w3.org/2000/svg';
|
17
19
|
const iconColorFill = `
|
18
20
|
style='fill: var(--icon-color);'
|
@@ -117,16 +119,23 @@ class IconProvider {
|
|
117
119
|
icon.setAttribute('viewBox', '-10 -10 110 110');
|
118
120
|
return icon;
|
119
121
|
}
|
120
|
-
makeEraserIcon(eraserSize) {
|
122
|
+
makeEraserIcon(eraserSize, mode) {
|
121
123
|
const icon = document.createElementNS(svgNamespace, 'svg');
|
122
124
|
eraserSize ??= 10;
|
123
125
|
const scaledSize = eraserSize / 4;
|
124
126
|
const eraserColor = '#ff70af';
|
125
127
|
// Draw an eraser-like shape. Created with Inkscape
|
126
128
|
icon.innerHTML = `
|
129
|
+
<defs>
|
130
|
+
<linearGradient id="dash-pattern">
|
131
|
+
<stop offset="80%" stop-color="${eraserColor}"/>
|
132
|
+
<stop offset="85%" stop-color="white"/>
|
133
|
+
<stop offset="90%" stop-color="${eraserColor}"/>
|
134
|
+
</linearGradient>
|
135
|
+
</defs>
|
127
136
|
<g>
|
128
137
|
<path
|
129
|
-
style="fill:${eraserColor}"
|
138
|
+
style="fill:${mode === Eraser_1.EraserMode.PartialStroke ? 'url(#dash-pattern)' : eraserColor}"
|
130
139
|
stroke="black"
|
131
140
|
transform="rotate(41.35)"
|
132
141
|
d="M 52.5 27
|
@@ -840,7 +849,10 @@ class IconProvider {
|
|
840
849
|
* @returns true if the given `penStyle` is known to match a rounded tip type of pen.
|
841
850
|
*/
|
842
851
|
isRoundedTipPen(penStyle) {
|
843
|
-
return penStyle.factory === FreehandLineBuilder_1.makeFreehandLineBuilder;
|
852
|
+
return penStyle.factory === FreehandLineBuilder_1.makeFreehandLineBuilder || penStyle.factory === PolylineBuilder_1.makePolylineBuilder;
|
853
|
+
}
|
854
|
+
isPolylinePen(penStyle) {
|
855
|
+
return penStyle.factory === PolylineBuilder_1.makePolylineBuilder;
|
844
856
|
}
|
845
857
|
/** Must be overridden by icon packs that need attribution. */
|
846
858
|
licenseInfo() { return null; }
|
@@ -17,9 +17,11 @@ export interface ToolbarLocalization extends ToolbarUtilsLocalization {
|
|
17
17
|
dragAndDropHereOrBrowse: string;
|
18
18
|
cancel: string;
|
19
19
|
submit: string;
|
20
|
+
addAll: string;
|
20
21
|
roundedTipPen: string;
|
22
|
+
roundedTipPen2: string;
|
21
23
|
flatTipPen: string;
|
22
|
-
|
24
|
+
selectPenType: string;
|
23
25
|
selectShape: string;
|
24
26
|
colorLabel: string;
|
25
27
|
pen: string;
|
@@ -30,6 +32,7 @@ export interface ToolbarLocalization extends ToolbarUtilsLocalization {
|
|
30
32
|
resizeImageToSelection: string;
|
31
33
|
deleteSelection: string;
|
32
34
|
duplicateSelection: string;
|
35
|
+
fullStrokeEraser: string;
|
33
36
|
pickColorFromScreen: string;
|
34
37
|
clickToPickColorAnnouncement: string;
|
35
38
|
colorSelectionCanceledAnnouncement: string;
|
@@ -54,6 +57,7 @@ export interface ToolbarLocalization extends ToolbarUtilsLocalization {
|
|
54
57
|
strokeAutocorrect: string;
|
55
58
|
errorImageHasZeroSize: string;
|
56
59
|
describeTheImage: string;
|
60
|
+
fileInput__loading: string;
|
57
61
|
penDropdown__baseHelpText: string;
|
58
62
|
penDropdown__colorHelpText: string;
|
59
63
|
penDropdown__thicknessHelpText: string;
|
@@ -66,7 +70,10 @@ export interface ToolbarLocalization extends ToolbarUtilsLocalization {
|
|
66
70
|
handDropdown__zoomOutHelpText: string;
|
67
71
|
handDropdown__resetViewHelpText: string;
|
68
72
|
handDropdown__touchPanningHelpText: string;
|
73
|
+
eraserDropdown__baseHelpText: string;
|
74
|
+
eraserDropdown__fullStrokeEraserHelpText: string;
|
69
75
|
handDropdown__lockRotationHelpText: string;
|
76
|
+
eraserDropdown__thicknessHelpText: string;
|
70
77
|
selectionDropdown__baseHelpText: string;
|
71
78
|
selectionDropdown__resizeToHelpText: string;
|
72
79
|
selectionDropdown__deleteHelpText: string;
|
@@ -17,6 +17,7 @@ exports.defaultToolbarLocalization = {
|
|
17
17
|
chooseFile: 'Choose file',
|
18
18
|
dragAndDropHereOrBrowse: 'Drag and drop here\nor\n{{browse}}',
|
19
19
|
submit: 'Submit',
|
20
|
+
addAll: 'Add all',
|
20
21
|
cancel: 'Cancel',
|
21
22
|
resetView: 'Reset view',
|
22
23
|
thicknessLabel: 'Thickness',
|
@@ -30,7 +31,8 @@ exports.defaultToolbarLocalization = {
|
|
30
31
|
save: 'Save',
|
31
32
|
undo: 'Undo',
|
32
33
|
redo: 'Redo',
|
33
|
-
|
34
|
+
fullStrokeEraser: 'Full stroke eraser',
|
35
|
+
selectPenType: 'Pen type',
|
34
36
|
selectShape: 'Shape',
|
35
37
|
pickColorFromScreen: 'Pick color from screen',
|
36
38
|
clickToPickColorAnnouncement: 'Click on the screen to pick a color',
|
@@ -48,6 +50,7 @@ exports.defaultToolbarLocalization = {
|
|
48
50
|
strokeAutocorrect: 'Autocorrect',
|
49
51
|
touchPanning: 'Touchscreen panning',
|
50
52
|
roundedTipPen: 'Round',
|
53
|
+
roundedTipPen2: 'Polyline',
|
51
54
|
flatTipPen: 'Flat',
|
52
55
|
arrowPen: 'Arrow',
|
53
56
|
linePen: 'Line',
|
@@ -58,11 +61,12 @@ exports.defaultToolbarLocalization = {
|
|
58
61
|
paste: 'Paste',
|
59
62
|
errorImageHasZeroSize: 'Error: Image has zero size',
|
60
63
|
describeTheImage: 'Image description',
|
64
|
+
fileInput__loading: 'Loading...',
|
61
65
|
// Help text
|
62
66
|
penDropdown__baseHelpText: 'This tool draws shapes or freehand lines.',
|
63
67
|
penDropdown__colorHelpText: 'Changes the pen\'s color',
|
64
68
|
penDropdown__thicknessHelpText: 'Changes the thickness of strokes drawn by the pen.',
|
65
|
-
penDropdown__penTypeHelpText: 'Changes the pen style.\n\nEither a “pen
|
69
|
+
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.',
|
66
70
|
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.',
|
67
71
|
penDropdown__stabilizationHelpText: 'Draws smoother strokes.\n\nThis also adds a short delay between the mouse/stylus and the stroke.',
|
68
72
|
handDropdown__baseHelpText: 'This tool is responsible for scrolling, rotating, and zooming the editor.',
|
@@ -72,6 +76,9 @@ exports.defaultToolbarLocalization = {
|
|
72
76
|
handDropdown__zoomDisplayHelpText: 'Shows the current zoom level. 100% shows the image at its actual size.',
|
73
77
|
handDropdown__touchPanningHelpText: 'When enabled, touch gestures move the image rather than select or draw.',
|
74
78
|
handDropdown__lockRotationHelpText: 'When enabled, prevents touch gestures from rotating the screen.',
|
79
|
+
eraserDropdown__baseHelpText: 'This tool removes strokes, images, and text under the cursor.',
|
80
|
+
eraserDropdown__thicknessHelpText: 'Changes the size of the eraser.',
|
81
|
+
eraserDropdown__fullStrokeEraserHelpText: 'When in full-stroke mode, entire shapes are erased.\n\nWhen not in full-stroke mode, shapes can be partially erased.',
|
75
82
|
selectionDropdown__baseHelpText: 'Selects content and manipulates the selection',
|
76
83
|
selectionDropdown__resizeToHelpText: 'Crops the drawing to the size of what\'s currently selected.\n\nIf auto-resize is enabled, it will be disabled.',
|
77
84
|
selectionDropdown__deleteHelpText: 'Erases selected items.',
|
@@ -126,6 +126,7 @@ export default abstract class BaseWidget {
|
|
126
126
|
setHidden(hidden: boolean): void;
|
127
127
|
/** Set whether the widget is contained within another. @internal */
|
128
128
|
setIsToplevel(toplevel: boolean): void;
|
129
|
+
/** Returns true if the menu for this widget is open. */
|
129
130
|
protected isDropdownVisible(): boolean;
|
130
131
|
protected isSelected(): boolean;
|
131
132
|
private createDropdownIcon;
|
@@ -1,15 +1,20 @@
|
|
1
1
|
import Editor from '../../Editor';
|
2
2
|
import Eraser from '../../tools/Eraser';
|
3
3
|
import { ToolbarLocalization } from '../localization';
|
4
|
+
import HelpDisplay from '../utils/HelpDisplay';
|
4
5
|
import BaseToolWidget from './BaseToolWidget';
|
5
6
|
import { SavedToolbuttonState } from './BaseWidget';
|
6
7
|
export default class EraserToolWidget extends BaseToolWidget {
|
7
8
|
private tool;
|
8
9
|
private updateInputs;
|
9
10
|
constructor(editor: Editor, tool: Eraser, localizationTable?: ToolbarLocalization);
|
11
|
+
protected getHelpText(): string;
|
10
12
|
protected getTitle(): string;
|
13
|
+
private makeIconForType;
|
11
14
|
protected createIcon(): Element;
|
12
|
-
|
15
|
+
private static idCounter;
|
16
|
+
private makeEraserTypeSelector;
|
17
|
+
protected fillDropdown(dropdown: HTMLElement, helpDisplay?: HelpDisplay): boolean;
|
13
18
|
serializeState(): SavedToolbuttonState;
|
14
19
|
deserializeFrom(state: SavedToolbuttonState): void;
|
15
20
|
}
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
const Eraser_1 = require("../../tools/Eraser");
|
6
7
|
const types_1 = require("../../types");
|
7
8
|
const constants_1 = require("../constants");
|
8
9
|
const BaseToolWidget_1 = __importDefault(require("./BaseToolWidget"));
|
@@ -19,26 +20,57 @@ class EraserToolWidget extends BaseToolWidget_1.default {
|
|
19
20
|
}
|
20
21
|
});
|
21
22
|
}
|
23
|
+
getHelpText() {
|
24
|
+
return this.localizationTable.eraserDropdown__baseHelpText;
|
25
|
+
}
|
22
26
|
getTitle() {
|
23
27
|
return this.localizationTable.eraser;
|
24
28
|
}
|
29
|
+
makeIconForType(mode) {
|
30
|
+
return this.editor.icons.makeEraserIcon(this.tool.getThickness(), mode);
|
31
|
+
}
|
25
32
|
createIcon() {
|
26
|
-
return this.
|
33
|
+
return this.makeIconForType(this.tool.getModeValue().get());
|
34
|
+
}
|
35
|
+
makeEraserTypeSelector(helpDisplay) {
|
36
|
+
const container = document.createElement('div');
|
37
|
+
const labelElement = document.createElement('label');
|
38
|
+
const checkboxElement = document.createElement('input');
|
39
|
+
checkboxElement.id = `${constants_1.toolbarCSSPrefix}eraserToolWidget-${EraserToolWidget.idCounter++}`;
|
40
|
+
labelElement.htmlFor = checkboxElement.id;
|
41
|
+
labelElement.innerText = this.localizationTable.fullStrokeEraser;
|
42
|
+
checkboxElement.type = 'checkbox';
|
43
|
+
checkboxElement.oninput = () => {
|
44
|
+
this.tool.getModeValue().set(checkboxElement.checked ? Eraser_1.EraserMode.FullStroke : Eraser_1.EraserMode.PartialStroke);
|
45
|
+
};
|
46
|
+
const updateValue = () => {
|
47
|
+
checkboxElement.checked = this.tool.getModeValue().get() === Eraser_1.EraserMode.FullStroke;
|
48
|
+
};
|
49
|
+
container.replaceChildren(labelElement, checkboxElement);
|
50
|
+
helpDisplay?.registerTextHelpForElement(container, this.localizationTable.eraserDropdown__fullStrokeEraserHelpText);
|
51
|
+
return {
|
52
|
+
addTo: (parent) => {
|
53
|
+
parent.appendChild(container);
|
54
|
+
},
|
55
|
+
updateValue,
|
56
|
+
};
|
27
57
|
}
|
28
|
-
fillDropdown(dropdown) {
|
58
|
+
fillDropdown(dropdown, helpDisplay) {
|
29
59
|
const container = document.createElement('div');
|
30
60
|
container.classList.add(`${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}nonbutton-controls-main-list`);
|
31
61
|
const thicknessSlider = (0, makeThicknessSlider_1.default)(this.editor, thickness => {
|
32
62
|
this.tool.setThickness(thickness);
|
33
63
|
});
|
34
64
|
thicknessSlider.setBounds(10, 55);
|
65
|
+
helpDisplay?.registerTextHelpForElement(thicknessSlider.container, this.localizationTable.eraserDropdown__thicknessHelpText);
|
66
|
+
const modeSelector = this.makeEraserTypeSelector(helpDisplay);
|
35
67
|
this.updateInputs = () => {
|
36
68
|
thicknessSlider.setValue(this.tool.getThickness());
|
69
|
+
modeSelector.updateValue();
|
37
70
|
};
|
38
71
|
this.updateInputs();
|
39
|
-
|
40
|
-
|
41
|
-
container.replaceChildren(thicknessSlider.container, spacer);
|
72
|
+
container.replaceChildren(thicknessSlider.container);
|
73
|
+
modeSelector.addTo(container);
|
42
74
|
dropdown.replaceChildren(container);
|
43
75
|
return true;
|
44
76
|
}
|
@@ -46,6 +78,7 @@ class EraserToolWidget extends BaseToolWidget_1.default {
|
|
46
78
|
return {
|
47
79
|
...super.serializeState(),
|
48
80
|
thickness: this.tool.getThickness(),
|
81
|
+
mode: this.tool.getModeValue().get(),
|
49
82
|
};
|
50
83
|
}
|
51
84
|
deserializeFrom(state) {
|
@@ -57,6 +90,13 @@ class EraserToolWidget extends BaseToolWidget_1.default {
|
|
57
90
|
}
|
58
91
|
this.tool.setThickness(parsedThickness);
|
59
92
|
}
|
93
|
+
if (state.mode) {
|
94
|
+
const mode = state.mode;
|
95
|
+
if (Object.values(Eraser_1.EraserMode).includes(mode)) {
|
96
|
+
this.tool.getModeValue().set(mode);
|
97
|
+
}
|
98
|
+
}
|
60
99
|
}
|
61
100
|
}
|
101
|
+
EraserToolWidget.idCounter = 0;
|
62
102
|
exports.default = EraserToolWidget;
|
@@ -0,0 +1,22 @@
|
|
1
|
+
import { RenderableImage } from 'js-draw/src/rendering/renderers/AbstractRenderer';
|
2
|
+
/** Handles filtering and other operations on an image. */
|
3
|
+
export declare class ImageWrapper {
|
4
|
+
private imageBase64Url;
|
5
|
+
private preview;
|
6
|
+
private onUrlUpdate;
|
7
|
+
private readonly originalSrc;
|
8
|
+
private altText;
|
9
|
+
private constructor();
|
10
|
+
private updateImageData;
|
11
|
+
decreaseSize(resizeFactor?: number): void;
|
12
|
+
reset(): void;
|
13
|
+
isChanged(): boolean;
|
14
|
+
getBase64Url(): string;
|
15
|
+
getAltText(): string;
|
16
|
+
setAltText(text: string): void;
|
17
|
+
static fromSrcAndPreview(initialBase64Src: string, preview: HTMLImageElement, onUrlUpdate: () => void): ImageWrapper;
|
18
|
+
static fromRenderable(renderable: RenderableImage, onUrlUpdate: () => void): {
|
19
|
+
wrapper: ImageWrapper;
|
20
|
+
preview: HTMLImageElement;
|
21
|
+
};
|
22
|
+
}
|
@@ -0,0 +1,58 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.ImageWrapper = void 0;
|
4
|
+
/** Handles filtering and other operations on an image. */
|
5
|
+
class ImageWrapper {
|
6
|
+
constructor(imageBase64Url, preview, onUrlUpdate) {
|
7
|
+
this.imageBase64Url = imageBase64Url;
|
8
|
+
this.preview = preview;
|
9
|
+
this.onUrlUpdate = onUrlUpdate;
|
10
|
+
this.originalSrc = imageBase64Url;
|
11
|
+
preview.src = imageBase64Url;
|
12
|
+
}
|
13
|
+
updateImageData(base64DataUrl) {
|
14
|
+
this.preview.src = base64DataUrl;
|
15
|
+
this.imageBase64Url = base64DataUrl;
|
16
|
+
this.onUrlUpdate();
|
17
|
+
}
|
18
|
+
decreaseSize(resizeFactor = 3 / 4) {
|
19
|
+
const canvas = document.createElement('canvas');
|
20
|
+
canvas.width = this.preview.naturalWidth * resizeFactor;
|
21
|
+
canvas.height = this.preview.naturalHeight * resizeFactor;
|
22
|
+
const ctx = canvas.getContext('2d');
|
23
|
+
ctx?.drawImage(this.preview, 0, 0, canvas.width, canvas.height);
|
24
|
+
// JPEG can be much smaller than PNG for the same image size. Prefer it if
|
25
|
+
// the image is already a JPEG.
|
26
|
+
const format = this.originalSrc?.startsWith('data:image/jpeg;') ? 'image/jpeg' : 'image/png';
|
27
|
+
this.updateImageData(canvas.toDataURL(format));
|
28
|
+
}
|
29
|
+
reset() {
|
30
|
+
this.updateImageData(this.originalSrc);
|
31
|
+
}
|
32
|
+
isChanged() {
|
33
|
+
return this.imageBase64Url !== this.originalSrc;
|
34
|
+
}
|
35
|
+
getBase64Url() {
|
36
|
+
return this.imageBase64Url;
|
37
|
+
}
|
38
|
+
getAltText() {
|
39
|
+
return this.altText;
|
40
|
+
}
|
41
|
+
setAltText(text) {
|
42
|
+
this.altText = text;
|
43
|
+
}
|
44
|
+
static fromSrcAndPreview(initialBase64Src, preview, onUrlUpdate) {
|
45
|
+
return new ImageWrapper(initialBase64Src, preview, onUrlUpdate);
|
46
|
+
}
|
47
|
+
static fromRenderable(renderable, onUrlUpdate) {
|
48
|
+
const preview = new Image();
|
49
|
+
preview.src = renderable.base64Url;
|
50
|
+
const result = new ImageWrapper(renderable.base64Url, preview, onUrlUpdate);
|
51
|
+
const altText = renderable.label ?? renderable.image.getAttribute('alt');
|
52
|
+
if (altText) {
|
53
|
+
result.setAltText(altText);
|
54
|
+
}
|
55
|
+
return { wrapper: result, preview };
|
56
|
+
}
|
57
|
+
}
|
58
|
+
exports.ImageWrapper = ImageWrapper;
|
@@ -0,0 +1,21 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
const fileToBase64Url_1 = __importDefault(require("../../../util/fileToBase64Url"));
|
7
|
+
const math_1 = require("@js-draw/math");
|
8
|
+
const fileToImages = async (imageFile) => {
|
9
|
+
const result = [];
|
10
|
+
const imageElement = new Image();
|
11
|
+
const base64Url = await (0, fileToBase64Url_1.default)(imageFile);
|
12
|
+
if (base64Url) {
|
13
|
+
result.push({
|
14
|
+
image: imageElement,
|
15
|
+
base64Url: base64Url,
|
16
|
+
transform: math_1.Mat33.identity,
|
17
|
+
});
|
18
|
+
}
|
19
|
+
return result;
|
20
|
+
};
|
21
|
+
exports.default = fileToImages;
|
@@ -0,0 +1,37 @@
|
|
1
|
+
import Editor from '../../../Editor';
|
2
|
+
import { ToolbarLocalization } from '../../localization';
|
3
|
+
import BaseWidget from '../BaseWidget';
|
4
|
+
/**
|
5
|
+
* Provides a widget that allows inserting or modifying raster images.
|
6
|
+
*
|
7
|
+
* It's possible to customize the file picker used by this widget through {@link EditorSettings.image}.
|
8
|
+
*
|
9
|
+
* @example
|
10
|
+
* ```ts,runnable
|
11
|
+
* import { Editor, makeEdgeToolbar, InsertImageWidget } from 'js-draw';
|
12
|
+
*
|
13
|
+
* const editor = new Editor(document.body);
|
14
|
+
* const toolbar = makeEdgeToolbar(editor);
|
15
|
+
*
|
16
|
+
* toolbar.addWidget(new InsertImageWidget(editor));
|
17
|
+
* ```
|
18
|
+
*/
|
19
|
+
export default class InsertImageWidget extends BaseWidget {
|
20
|
+
private images;
|
21
|
+
private imagesPreview;
|
22
|
+
private selectedFiles;
|
23
|
+
private imageAltTextInput;
|
24
|
+
private statusView;
|
25
|
+
private submitButton;
|
26
|
+
constructor(editor: Editor, localization?: ToolbarLocalization);
|
27
|
+
protected getTitle(): string;
|
28
|
+
protected createIcon(): Element | null;
|
29
|
+
protected setDropdownVisible(visible: boolean): void;
|
30
|
+
protected handleClick(): void;
|
31
|
+
private static nextInputId;
|
32
|
+
protected fillDropdown(dropdown: HTMLElement): boolean;
|
33
|
+
private onImageDataUpdate;
|
34
|
+
private hideDialog;
|
35
|
+
private updateImageSizeDisplay;
|
36
|
+
private updateInputs;
|
37
|
+
}
|