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.
Files changed (181) hide show
  1. package/README.md +70 -10
  2. package/dist/Editor.css +35 -3
  3. package/dist/bundle.js +2 -2
  4. package/dist/bundledStyles.js +1 -1
  5. package/dist/cjs/Editor.d.ts +38 -21
  6. package/dist/cjs/Editor.js +11 -2
  7. package/dist/cjs/{SVGLoader.d.ts → SVGLoader/index.d.ts} +1 -1
  8. package/dist/cjs/{SVGLoader.js → SVGLoader/index.js} +12 -29
  9. package/dist/cjs/SVGLoader/utils/determineFontSize.d.ts +3 -0
  10. package/dist/cjs/SVGLoader/utils/determineFontSize.js +27 -0
  11. package/dist/cjs/Viewport.d.ts +33 -1
  12. package/dist/cjs/components/AbstractComponent.d.ts +17 -5
  13. package/dist/cjs/components/AbstractComponent.js +15 -15
  14. package/dist/cjs/components/Stroke.d.ts +4 -1
  15. package/dist/cjs/components/Stroke.js +158 -2
  16. package/dist/cjs/components/TextComponent.js +3 -1
  17. package/dist/cjs/components/builders/PolylineBuilder.d.ts +1 -1
  18. package/dist/cjs/components/builders/PolylineBuilder.js +9 -2
  19. package/dist/cjs/components/builders/PressureSensitiveFreehandLineBuilder.d.ts +1 -1
  20. package/dist/cjs/components/builders/PressureSensitiveFreehandLineBuilder.js +44 -51
  21. package/dist/cjs/image/EditorImage.js +1 -1
  22. package/dist/cjs/localizations/de.js +1 -1
  23. package/dist/cjs/localizations/es.js +1 -1
  24. package/dist/cjs/rendering/caching/RenderingCacheNode.js +20 -15
  25. package/dist/cjs/testing/createEditor.d.ts +2 -2
  26. package/dist/cjs/testing/createEditor.js +2 -2
  27. package/dist/cjs/testing/findNodeWithText.d.ts +3 -0
  28. package/dist/cjs/testing/findNodeWithText.js +16 -0
  29. package/dist/cjs/testing/firstElementAncestorOfNode.d.ts +3 -0
  30. package/dist/cjs/testing/firstElementAncestorOfNode.js +13 -0
  31. package/dist/cjs/testing/sendKeyPressRelease.d.ts +3 -0
  32. package/dist/cjs/testing/sendKeyPressRelease.js +8 -0
  33. package/dist/cjs/testing/sendPenEvent.d.ts +2 -2
  34. package/dist/cjs/testing/sendPenEvent.js +26 -3
  35. package/dist/cjs/toolbar/IconProvider.d.ts +3 -1
  36. package/dist/cjs/toolbar/IconProvider.js +15 -3
  37. package/dist/cjs/toolbar/localization.d.ts +8 -1
  38. package/dist/cjs/toolbar/localization.js +9 -2
  39. package/dist/cjs/toolbar/widgets/BaseWidget.d.ts +1 -0
  40. package/dist/cjs/toolbar/widgets/BaseWidget.js +1 -0
  41. package/dist/cjs/toolbar/widgets/EraserToolWidget.d.ts +6 -1
  42. package/dist/cjs/toolbar/widgets/EraserToolWidget.js +45 -5
  43. package/dist/cjs/toolbar/widgets/InsertImageWidget/ImageWrapper.d.ts +22 -0
  44. package/dist/cjs/toolbar/widgets/InsertImageWidget/ImageWrapper.js +58 -0
  45. package/dist/cjs/toolbar/widgets/InsertImageWidget/fileToImages.d.ts +3 -0
  46. package/dist/cjs/toolbar/widgets/InsertImageWidget/fileToImages.js +21 -0
  47. package/dist/cjs/toolbar/widgets/InsertImageWidget/index.d.ts +37 -0
  48. package/dist/cjs/toolbar/widgets/InsertImageWidget/index.js +281 -0
  49. package/dist/cjs/toolbar/widgets/PenToolWidget.js +10 -3
  50. package/dist/cjs/toolbar/widgets/PenToolWidget.test.d.ts +1 -0
  51. package/dist/cjs/toolbar/widgets/TextToolWidget.js +5 -3
  52. package/dist/cjs/toolbar/widgets/TextToolWidget.test.d.ts +1 -0
  53. package/dist/cjs/toolbar/widgets/components/makeFileInput.d.ts +12 -2
  54. package/dist/cjs/toolbar/widgets/components/makeFileInput.js +102 -45
  55. package/dist/cjs/toolbar/widgets/components/makeFileInput.test.d.ts +1 -0
  56. package/dist/cjs/toolbar/widgets/components/makeSnappedList.d.ts +15 -0
  57. package/dist/cjs/toolbar/widgets/components/makeSnappedList.js +103 -0
  58. package/dist/cjs/toolbar/widgets/keybindings.js +1 -1
  59. package/dist/cjs/tools/Eraser.d.ts +31 -6
  60. package/dist/cjs/tools/Eraser.js +161 -21
  61. package/dist/cjs/tools/PasteHandler.js +0 -1
  62. package/dist/cjs/tools/SelectionTool/Selection.d.ts +2 -2
  63. package/dist/cjs/tools/SelectionTool/Selection.js +20 -20
  64. package/dist/cjs/tools/SelectionTool/SelectionHandle.d.ts +8 -2
  65. package/dist/cjs/tools/SelectionTool/SelectionHandle.js +6 -0
  66. package/dist/cjs/tools/SelectionTool/SelectionTool.js +1 -1
  67. package/dist/cjs/tools/SelectionTool/types.d.ts +19 -0
  68. package/dist/cjs/tools/TextTool.js +2 -1
  69. package/dist/cjs/tools/TextTool.test.d.ts +1 -0
  70. package/dist/cjs/tools/ToolController.d.ts +2 -0
  71. package/dist/cjs/tools/ToolController.js +10 -1
  72. package/dist/cjs/tools/lib.d.ts +1 -4
  73. package/dist/cjs/tools/lib.js +2 -4
  74. package/dist/cjs/util/ReactiveValue.d.ts +2 -0
  75. package/dist/cjs/util/ReactiveValue.js +11 -0
  76. package/dist/cjs/util/bytesToSizeString.d.ts +8 -0
  77. package/dist/cjs/util/bytesToSizeString.js +26 -0
  78. package/dist/cjs/util/bytesToSizeString.test.d.ts +1 -0
  79. package/dist/cjs/util/stopPropagationOfScrollingWheelEvents.js +10 -6
  80. package/dist/cjs/util/waitForAll.d.ts +2 -0
  81. package/dist/cjs/util/waitForAll.js +2 -0
  82. package/dist/cjs/util/waitForImageLoaded.js +3 -0
  83. package/dist/cjs/util/waitForTimeout.d.ts +1 -0
  84. package/dist/cjs/util/waitForTimeout.js +1 -1
  85. package/dist/cjs/version.js +1 -1
  86. package/dist/mjs/Editor.d.ts +38 -21
  87. package/dist/mjs/Editor.mjs +11 -2
  88. package/dist/mjs/{SVGLoader.d.ts → SVGLoader/index.d.ts} +1 -1
  89. package/dist/mjs/{SVGLoader.mjs → SVGLoader/index.mjs} +12 -29
  90. package/dist/mjs/SVGLoader/index.test.d.ts +1 -0
  91. package/dist/mjs/SVGLoader/utils/determineFontSize.d.ts +3 -0
  92. package/dist/mjs/SVGLoader/utils/determineFontSize.mjs +25 -0
  93. package/dist/mjs/Viewport.d.ts +33 -1
  94. package/dist/mjs/components/AbstractComponent.d.ts +17 -5
  95. package/dist/mjs/components/AbstractComponent.mjs +15 -15
  96. package/dist/mjs/components/Stroke.d.ts +4 -1
  97. package/dist/mjs/components/Stroke.mjs +159 -3
  98. package/dist/mjs/components/TextComponent.mjs +3 -1
  99. package/dist/mjs/components/builders/PolylineBuilder.d.ts +1 -1
  100. package/dist/mjs/components/builders/PolylineBuilder.mjs +10 -3
  101. package/dist/mjs/components/builders/PressureSensitiveFreehandLineBuilder.d.ts +1 -1
  102. package/dist/mjs/components/builders/PressureSensitiveFreehandLineBuilder.mjs +45 -52
  103. package/dist/mjs/image/EditorImage.mjs +1 -1
  104. package/dist/mjs/localizations/de.mjs +1 -1
  105. package/dist/mjs/localizations/es.mjs +1 -1
  106. package/dist/mjs/rendering/caching/RenderingCacheNode.mjs +20 -15
  107. package/dist/mjs/testing/createEditor.d.ts +2 -2
  108. package/dist/mjs/testing/createEditor.mjs +2 -2
  109. package/dist/mjs/testing/findNodeWithText.d.ts +3 -0
  110. package/dist/mjs/testing/findNodeWithText.mjs +14 -0
  111. package/dist/mjs/testing/firstElementAncestorOfNode.d.ts +3 -0
  112. package/dist/mjs/testing/firstElementAncestorOfNode.mjs +11 -0
  113. package/dist/mjs/testing/sendKeyPressRelease.d.ts +3 -0
  114. package/dist/mjs/testing/sendKeyPressRelease.mjs +6 -0
  115. package/dist/mjs/testing/sendPenEvent.d.ts +2 -2
  116. package/dist/mjs/testing/sendPenEvent.mjs +3 -3
  117. package/dist/mjs/toolbar/IconProvider.d.ts +3 -1
  118. package/dist/mjs/toolbar/IconProvider.mjs +15 -3
  119. package/dist/mjs/toolbar/localization.d.ts +8 -1
  120. package/dist/mjs/toolbar/localization.mjs +9 -2
  121. package/dist/mjs/toolbar/widgets/BaseWidget.d.ts +1 -0
  122. package/dist/mjs/toolbar/widgets/BaseWidget.mjs +1 -0
  123. package/dist/mjs/toolbar/widgets/EraserToolWidget.d.ts +6 -1
  124. package/dist/mjs/toolbar/widgets/EraserToolWidget.mjs +47 -6
  125. package/dist/mjs/toolbar/widgets/InsertImageWidget/ImageWrapper.d.ts +22 -0
  126. package/dist/mjs/toolbar/widgets/InsertImageWidget/ImageWrapper.mjs +54 -0
  127. package/dist/mjs/toolbar/widgets/InsertImageWidget/fileToImages.d.ts +3 -0
  128. package/dist/mjs/toolbar/widgets/InsertImageWidget/fileToImages.mjs +16 -0
  129. package/dist/mjs/toolbar/widgets/InsertImageWidget/index.d.ts +37 -0
  130. package/dist/mjs/toolbar/widgets/InsertImageWidget/index.mjs +276 -0
  131. package/dist/mjs/toolbar/widgets/InsertImageWidget/index.test.d.ts +1 -0
  132. package/dist/mjs/toolbar/widgets/PenToolWidget.mjs +10 -3
  133. package/dist/mjs/toolbar/widgets/PenToolWidget.test.d.ts +1 -0
  134. package/dist/mjs/toolbar/widgets/TextToolWidget.mjs +5 -3
  135. package/dist/mjs/toolbar/widgets/TextToolWidget.test.d.ts +1 -0
  136. package/dist/mjs/toolbar/widgets/components/makeFileInput.d.ts +12 -2
  137. package/dist/mjs/toolbar/widgets/components/makeFileInput.mjs +102 -45
  138. package/dist/mjs/toolbar/widgets/components/makeFileInput.test.d.ts +1 -0
  139. package/dist/mjs/toolbar/widgets/components/makeSnappedList.d.ts +15 -0
  140. package/dist/mjs/toolbar/widgets/components/makeSnappedList.mjs +98 -0
  141. package/dist/mjs/toolbar/widgets/keybindings.mjs +1 -1
  142. package/dist/mjs/tools/Eraser.d.ts +31 -6
  143. package/dist/mjs/tools/Eraser.mjs +161 -22
  144. package/dist/mjs/tools/PasteHandler.mjs +0 -1
  145. package/dist/mjs/tools/SelectionTool/Selection.d.ts +2 -2
  146. package/dist/mjs/tools/SelectionTool/Selection.mjs +20 -20
  147. package/dist/mjs/tools/SelectionTool/SelectionHandle.d.ts +8 -2
  148. package/dist/mjs/tools/SelectionTool/SelectionHandle.mjs +6 -0
  149. package/dist/mjs/tools/SelectionTool/SelectionTool.mjs +1 -1
  150. package/dist/mjs/tools/SelectionTool/types.d.ts +19 -0
  151. package/dist/mjs/tools/TextTool.mjs +2 -1
  152. package/dist/mjs/tools/TextTool.test.d.ts +1 -0
  153. package/dist/mjs/tools/ToolController.d.ts +2 -0
  154. package/dist/mjs/tools/ToolController.mjs +10 -1
  155. package/dist/mjs/tools/lib.d.ts +1 -4
  156. package/dist/mjs/tools/lib.mjs +1 -4
  157. package/dist/mjs/util/ReactiveValue.d.ts +2 -0
  158. package/dist/mjs/util/ReactiveValue.mjs +11 -0
  159. package/dist/mjs/util/bytesToSizeString.d.ts +8 -0
  160. package/dist/mjs/util/bytesToSizeString.mjs +24 -0
  161. package/dist/mjs/util/bytesToSizeString.test.d.ts +1 -0
  162. package/dist/mjs/util/stopPropagationOfScrollingWheelEvents.mjs +10 -6
  163. package/dist/mjs/util/waitForAll.d.ts +2 -0
  164. package/dist/mjs/util/waitForAll.mjs +2 -0
  165. package/dist/mjs/util/waitForImageLoaded.mjs +3 -0
  166. package/dist/mjs/util/waitForTimeout.d.ts +1 -0
  167. package/dist/mjs/util/waitForTimeout.mjs +1 -1
  168. package/dist/mjs/version.mjs +1 -1
  169. package/package.json +4 -4
  170. package/src/toolbar/toolbar.scss +1 -7
  171. package/src/toolbar/widgets/{InsertImageWidget.scss → InsertImageWidget/index.scss} +3 -2
  172. package/src/toolbar/widgets/components/components.scss +2 -1
  173. package/src/toolbar/widgets/components/makeFileInput.scss +14 -1
  174. package/src/toolbar/widgets/components/makeSnappedList.scss +28 -0
  175. package/src/toolbar/widgets/widgets.scss +7 -0
  176. package/dist/cjs/toolbar/widgets/InsertImageWidget.d.ts +0 -22
  177. package/dist/cjs/toolbar/widgets/InsertImageWidget.js +0 -269
  178. package/dist/mjs/toolbar/widgets/InsertImageWidget.d.ts +0 -22
  179. package/dist/mjs/toolbar/widgets/InsertImageWidget.mjs +0 -264
  180. /package/dist/cjs/{SVGLoader.test.d.ts → SVGLoader/index.test.d.ts} +0 -0
  181. /package/dist/{mjs/SVGLoader.test.d.ts → cjs/toolbar/widgets/InsertImageWidget/index.test.d.ts} +0 -0
@@ -0,0 +1,281 @@
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 ImageComponent_1 = __importDefault(require("../../../components/ImageComponent"));
7
+ const Erase_1 = __importDefault(require("../../../commands/Erase"));
8
+ const EditorImage_1 = __importDefault(require("../../../image/EditorImage"));
9
+ const uniteCommands_1 = __importDefault(require("../../../commands/uniteCommands"));
10
+ const SelectionTool_1 = __importDefault(require("../../../tools/SelectionTool/SelectionTool"));
11
+ const math_1 = require("@js-draw/math");
12
+ const BaseWidget_1 = __importDefault(require("../BaseWidget"));
13
+ const types_1 = require("../../../types");
14
+ const constants_1 = require("../../constants");
15
+ const makeFileInput_1 = __importDefault(require("../components/makeFileInput"));
16
+ const ReactiveValue_1 = require("../../../util/ReactiveValue");
17
+ const bytesToSizeString_1 = __importDefault(require("../../../util/bytesToSizeString"));
18
+ const ImageWrapper_1 = require("./ImageWrapper");
19
+ const makeSnappedList_1 = __importDefault(require("../components/makeSnappedList"));
20
+ const fileToImages_1 = __importDefault(require("./fileToImages"));
21
+ /**
22
+ * Provides a widget that allows inserting or modifying raster images.
23
+ *
24
+ * It's possible to customize the file picker used by this widget through {@link EditorSettings.image}.
25
+ *
26
+ * @example
27
+ * ```ts,runnable
28
+ * import { Editor, makeEdgeToolbar, InsertImageWidget } from 'js-draw';
29
+ *
30
+ * const editor = new Editor(document.body);
31
+ * const toolbar = makeEdgeToolbar(editor);
32
+ *
33
+ * toolbar.addWidget(new InsertImageWidget(editor));
34
+ * ```
35
+ */
36
+ class InsertImageWidget extends BaseWidget_1.default {
37
+ constructor(editor, localization) {
38
+ localization ??= editor.localization;
39
+ super(editor, 'insert-image-widget', localization);
40
+ // Make the dropdown showable
41
+ this.container.classList.add('dropdownShowable');
42
+ editor.notifier.on(types_1.EditorEventType.SelectionUpdated, event => {
43
+ if (event.kind === types_1.EditorEventType.SelectionUpdated && this.isDropdownVisible()) {
44
+ this.updateInputs();
45
+ }
46
+ });
47
+ this.images = ReactiveValue_1.MutableReactiveValue.fromInitialValue([]);
48
+ this.images.onUpdateAndNow(() => {
49
+ this.onImageDataUpdate();
50
+ });
51
+ }
52
+ getTitle() {
53
+ return this.localizationTable.image;
54
+ }
55
+ createIcon() {
56
+ return this.editor.icons.makeInsertImageIcon();
57
+ }
58
+ setDropdownVisible(visible) {
59
+ super.setDropdownVisible(visible);
60
+ // Update the dropdown just before showing.
61
+ if (this.isDropdownVisible()) {
62
+ this.updateInputs();
63
+ }
64
+ else {
65
+ // Allow any previously-selected files to be freed.
66
+ this.selectedFiles?.set([]);
67
+ }
68
+ }
69
+ handleClick() {
70
+ this.setDropdownVisible(!this.isDropdownVisible());
71
+ }
72
+ fillDropdown(dropdown) {
73
+ const container = document.createElement('div');
74
+ container.classList.add('insert-image-widget-dropdown-content', `${constants_1.toolbarCSSPrefix}spacedList`, `${constants_1.toolbarCSSPrefix}nonbutton-controls-main-list`);
75
+ const { container: chooseImageRow, selectedFiles, } = (0, makeFileInput_1.default)(this.localizationTable.chooseFile, this.editor, {
76
+ accepts: 'image/*',
77
+ allowMultiSelect: true,
78
+ customPickerAction: this.editor.getCurrentSettings().image?.showImagePicker,
79
+ });
80
+ const altTextRow = document.createElement('div');
81
+ this.imagesPreview = (0, makeSnappedList_1.default)(this.images);
82
+ this.statusView = document.createElement('div');
83
+ const actionButtonRow = document.createElement('div');
84
+ actionButtonRow.classList.add('action-button-row');
85
+ this.statusView.classList.add('insert-image-image-status-view');
86
+ this.submitButton = document.createElement('button');
87
+ this.selectedFiles = selectedFiles;
88
+ this.imageAltTextInput = document.createElement('input');
89
+ // Label the alt text input
90
+ const imageAltTextLabel = document.createElement('label');
91
+ const altTextInputId = `insert-image-alt-text-input-${InsertImageWidget.nextInputId++}`;
92
+ this.imageAltTextInput.setAttribute('id', altTextInputId);
93
+ imageAltTextLabel.htmlFor = altTextInputId;
94
+ imageAltTextLabel.innerText = this.localizationTable.inputAltText;
95
+ this.imageAltTextInput.type = 'text';
96
+ this.imageAltTextInput.placeholder = this.localizationTable.describeTheImage;
97
+ this.statusView.setAttribute('aria-live', 'polite');
98
+ this.submitButton.innerText = this.localizationTable.submit;
99
+ this.imagesPreview.visibleItem.onUpdateAndNow(() => this.onImageDataUpdate());
100
+ this.imageAltTextInput.oninput = () => {
101
+ const currentImage = this.imagesPreview.visibleItem.get();
102
+ if (currentImage) {
103
+ currentImage.setAltText(this.imageAltTextInput.value);
104
+ this.submitButton.style.display = '';
105
+ }
106
+ };
107
+ this.selectedFiles.onUpdateAndNow(async (files) => {
108
+ if (files.length === 0) {
109
+ this.images.set([]);
110
+ return;
111
+ }
112
+ const previews = (await Promise.all(files.map(async (imageFile) => {
113
+ let renderableImages;
114
+ try {
115
+ renderableImages = await (0, fileToImages_1.default)(imageFile);
116
+ }
117
+ catch (error) {
118
+ console.error('Image load error', error);
119
+ const errorMessage = this.localizationTable.imageLoadError(error);
120
+ this.statusView.innerText = errorMessage;
121
+ return [];
122
+ }
123
+ return renderableImages.map(image => {
124
+ const { wrapper, preview } = ImageWrapper_1.ImageWrapper.fromRenderable(image, () => this.onImageDataUpdate());
125
+ return {
126
+ data: wrapper,
127
+ element: preview,
128
+ };
129
+ });
130
+ }))).flat();
131
+ this.images.set(previews);
132
+ });
133
+ altTextRow.replaceChildren(imageAltTextLabel, this.imageAltTextInput);
134
+ actionButtonRow.replaceChildren(this.submitButton);
135
+ container.replaceChildren(chooseImageRow, altTextRow, this.imagesPreview.container, this.statusView, actionButtonRow);
136
+ dropdown.replaceChildren(container);
137
+ return true;
138
+ }
139
+ onImageDataUpdate() {
140
+ if (!this.imagesPreview)
141
+ return;
142
+ const currentImage = this.imagesPreview.visibleItem.get();
143
+ const base64Data = currentImage?.getBase64Url();
144
+ this.imageAltTextInput.value = currentImage?.getAltText() ?? '';
145
+ if (base64Data) {
146
+ this.submitButton.disabled = false;
147
+ this.submitButton.style.display = '';
148
+ this.updateImageSizeDisplay();
149
+ }
150
+ else {
151
+ this.submitButton.disabled = true;
152
+ this.submitButton.style.display = 'none';
153
+ this.statusView.innerText = '';
154
+ this.submitButton.disabled = true;
155
+ }
156
+ if (this.images.get().length <= 1) {
157
+ this.submitButton.innerText = this.localizationTable.submit;
158
+ }
159
+ else {
160
+ this.submitButton.innerText = this.localizationTable.addAll;
161
+ }
162
+ }
163
+ hideDialog() {
164
+ this.setDropdownVisible(false);
165
+ }
166
+ updateImageSizeDisplay() {
167
+ const currentImage = this.imagesPreview.visibleItem.get();
168
+ const imageData = currentImage?.getBase64Url() ?? '';
169
+ const { size, units } = (0, bytesToSizeString_1.default)(imageData.length);
170
+ const sizeText = document.createElement('span');
171
+ sizeText.innerText = this.localizationTable.imageSize(Math.round(size), units);
172
+ // Add a button to allow decreasing the size of large images.
173
+ const decreaseSizeButton = document.createElement('button');
174
+ decreaseSizeButton.innerText = this.localizationTable.decreaseImageSize;
175
+ decreaseSizeButton.onclick = () => {
176
+ currentImage?.decreaseSize();
177
+ };
178
+ const resetSizeButton = document.createElement('button');
179
+ resetSizeButton.innerText = this.localizationTable.resetImage;
180
+ resetSizeButton.onclick = () => {
181
+ currentImage?.reset();
182
+ };
183
+ this.statusView.replaceChildren(sizeText);
184
+ const largeImageThreshold = 0.12 * 1024 * 1024; // 0.12 MiB
185
+ if (imageData.length > largeImageThreshold) {
186
+ this.statusView.appendChild(decreaseSizeButton);
187
+ }
188
+ else if (currentImage?.isChanged()) {
189
+ this.statusView.appendChild(resetSizeButton);
190
+ }
191
+ }
192
+ updateInputs() {
193
+ const resetInputs = () => {
194
+ this.selectedFiles?.set([]);
195
+ this.imageAltTextInput.value = '';
196
+ this.submitButton.disabled = true;
197
+ this.statusView.innerText = '';
198
+ this.submitButton.style.display = '';
199
+ };
200
+ resetInputs();
201
+ const selectionTools = this.editor.toolController.getMatchingTools(SelectionTool_1.default);
202
+ const selectedObjects = selectionTools.map(tool => tool.getSelectedObjects()).flat();
203
+ // Check: Is there a selected image that can be edited?
204
+ let editingImage = null;
205
+ if (selectedObjects.length === 1 && selectedObjects[0] instanceof ImageComponent_1.default) {
206
+ editingImage = selectedObjects[0];
207
+ const image = new Image();
208
+ const imageWrapper = ImageWrapper_1.ImageWrapper.fromSrcAndPreview(editingImage.getURL(), image, () => this.onImageDataUpdate());
209
+ imageWrapper.setAltText(editingImage.getAltText() ?? '');
210
+ this.images.set([{ data: imageWrapper, element: image }]);
211
+ }
212
+ else if (selectedObjects.length > 0) {
213
+ // If not, clear the selection.
214
+ selectionTools.forEach(tool => tool.clearSelection());
215
+ }
216
+ // Show the submit button only when there is data to submit.
217
+ this.submitButton.style.display = 'none';
218
+ this.submitButton.onclick = async () => {
219
+ const newComponents = [];
220
+ let transform = math_1.Mat33.identity;
221
+ let fullBBox = null;
222
+ for (const { data: imageWrapper } of this.images.get()) {
223
+ if (!imageWrapper) {
224
+ continue;
225
+ }
226
+ const image = new Image();
227
+ image.src = imageWrapper.getBase64Url();
228
+ image.setAttribute('alt', this.imageAltTextInput.value);
229
+ let component;
230
+ try {
231
+ component = await ImageComponent_1.default.fromImage(image, transform);
232
+ }
233
+ catch (error) {
234
+ console.error('Error loading image', error);
235
+ this.statusView.innerText = this.localizationTable.imageLoadError(error);
236
+ return;
237
+ }
238
+ const componentBBox = component.getBBox();
239
+ if (componentBBox.area === 0) {
240
+ this.statusView.innerText = this.localizationTable.errorImageHasZeroSize;
241
+ return;
242
+ }
243
+ newComponents.push(component);
244
+ fullBBox ??= componentBBox;
245
+ fullBBox.union(componentBBox);
246
+ // Update the transform for the next item.
247
+ const shift = math_1.Vec2.of(0, componentBBox.height);
248
+ transform = transform.rightMul(math_1.Mat33.translation(shift));
249
+ }
250
+ if (newComponents.length) {
251
+ if (!fullBBox) {
252
+ throw new Error('Logic error: Full bounding box must be calculated when components are to be added.');
253
+ }
254
+ this.hideDialog();
255
+ if (editingImage) {
256
+ const eraseCommand = new Erase_1.default([editingImage]);
257
+ // Try to preserve the original width
258
+ const originalTransform = editingImage.getTransformation();
259
+ // || 1: Prevent division by zero
260
+ const originalWidth = editingImage.getBBox().width || 1;
261
+ const newWidth = fullBBox.transformedBoundingBox(originalTransform).width || 1;
262
+ const widthAdjustTransform = math_1.Mat33.scaling2D(originalWidth / newWidth);
263
+ const commands = [];
264
+ for (const component of newComponents) {
265
+ commands.push(EditorImage_1.default.addElement(component), component.transformBy(originalTransform.rightMul(widthAdjustTransform)), component.setZIndex(editingImage.getZIndex()));
266
+ }
267
+ this.editor.dispatch((0, uniteCommands_1.default)([
268
+ ...commands,
269
+ eraseCommand,
270
+ ]));
271
+ selectionTools[0]?.setSelection(newComponents);
272
+ }
273
+ else {
274
+ await this.editor.addAndCenterComponents(newComponents);
275
+ }
276
+ }
277
+ };
278
+ }
279
+ }
280
+ InsertImageWidget.nextInputId = 0;
281
+ exports.default = InsertImageWidget;
@@ -17,6 +17,7 @@ const keybindings_1 = require("./keybindings");
17
17
  const constants_1 = require("../constants");
18
18
  const makeThicknessSlider_1 = __importDefault(require("./components/makeThicknessSlider"));
19
19
  const makeGridSelector_1 = __importDefault(require("./components/makeGridSelector"));
20
+ const PolylineBuilder_1 = require("../../components/builders/PolylineBuilder");
20
21
  class PenToolWidget extends BaseToolWidget_1.default {
21
22
  constructor(editor, tool, localization) {
22
23
  super(editor, tool, 'pen', localization);
@@ -26,6 +27,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
26
27
  this.shapelikeIDs = ['pressure-sensitive-pen', 'freehand-pen'];
27
28
  // Additional client-specified pens.
28
29
  const additionalPens = editor.getCurrentSettings().pens?.additionalPenTypes ?? [];
30
+ const filterPens = editor.getCurrentSettings().pens?.filterPenTypes ?? (() => true);
29
31
  // Default pen types
30
32
  this.penTypes = [
31
33
  // Non-shape pens
@@ -39,6 +41,11 @@ class PenToolWidget extends BaseToolWidget_1.default {
39
41
  id: 'freehand-pen',
40
42
  factory: FreehandLineBuilder_1.makeFreehandLineBuilder,
41
43
  },
44
+ {
45
+ name: this.localizationTable.roundedTipPen2,
46
+ id: 'polyline-pen',
47
+ factory: PolylineBuilder_1.makePolylineBuilder,
48
+ },
42
49
  ...(additionalPens.filter(pen => !pen.isShapeBuilder)),
43
50
  // Shape pens
44
51
  {
@@ -72,7 +79,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
72
79
  factory: CircleBuilder_1.makeOutlinedCircleBuilder,
73
80
  },
74
81
  ...(additionalPens.filter(pen => pen.isShapeBuilder)),
75
- ];
82
+ ].filter(filterPens);
76
83
  this.editor.notifier.on(types_1.EditorEventType.ToolUpdated, toolEvt => {
77
84
  if (toolEvt.kind !== types_1.EditorEventType.ToolUpdated) {
78
85
  throw new Error('Invalid event type!');
@@ -116,7 +123,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
116
123
  style.factory = record.factory;
117
124
  }
118
125
  const strokeFactory = record?.factory;
119
- if (!strokeFactory || strokeFactory === FreehandLineBuilder_1.makeFreehandLineBuilder || strokeFactory === PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder) {
126
+ if (!strokeFactory || strokeFactory === FreehandLineBuilder_1.makeFreehandLineBuilder || strokeFactory === PressureSensitiveFreehandLineBuilder_1.makePressureSensitiveFreehandLineBuilder || strokeFactory === PolylineBuilder_1.makePolylineBuilder) {
120
127
  return this.editor.icons.makePenIcon(style);
121
128
  }
122
129
  else {
@@ -136,7 +143,7 @@ class PenToolWidget extends BaseToolWidget_1.default {
136
143
  isShapeBuilder: penType.isShapeBuilder ?? false,
137
144
  };
138
145
  });
139
- const penSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectPenTip, this.getCurrentPenTypeIdx(), allChoices.filter(choice => !choice.isShapeBuilder));
146
+ const penSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectPenType, this.getCurrentPenTypeIdx(), allChoices.filter(choice => !choice.isShapeBuilder));
140
147
  const shapeSelector = (0, makeGridSelector_1.default)(this.localizationTable.selectShape, this.getCurrentPenTypeIdx(), allChoices.filter(choice => choice.isShapeBuilder));
141
148
  const onSelectorUpdate = (newPenTypeIndex) => {
142
149
  this.tool.setStrokeFactory(this.penTypes[newPenTypeIndex].factory);
@@ -0,0 +1 @@
1
+ export {};
@@ -59,9 +59,11 @@ class TextToolWidget extends BaseToolWidget_1.default {
59
59
  colorLabel.setAttribute('for', colorInput.id);
60
60
  sizeInput.id = `${constants_1.toolbarCSSPrefix}-text-size-input-${TextToolWidget.idCounter++}`;
61
61
  sizeLabel.setAttribute('for', sizeInput.id);
62
- addFontToInput('monospace');
63
- addFontToInput('serif');
64
- addFontToInput('sans-serif');
62
+ const defaultFonts = this.editor.getCurrentSettings().text?.fonts ?? [];
63
+ for (const font of defaultFonts) {
64
+ addFontToInput(font);
65
+ }
66
+ fontInput.classList.add('font-selector');
65
67
  fontInput.id = `${constants_1.toolbarCSSPrefix}-text-font-input-${TextToolWidget.idCounter++}`;
66
68
  fontLabel.setAttribute('for', fontInput.id);
67
69
  fontInput.onchange = () => {
@@ -0,0 +1 @@
1
+ export {};
@@ -1,9 +1,19 @@
1
1
  import { MutableReactiveValue } from '../../../util/ReactiveValue';
2
2
  import { ToolbarContext } from '../../types';
3
+ export interface CustomFilePickerProps {
4
+ setOnCancelCallback(onCancel: () => void): void;
5
+ }
6
+ export type ShowCustomFilePickerCallback = (props: CustomFilePickerProps) => Promise<File[] | null>;
7
+ export interface FileInputOptions {
8
+ readonly accepts?: string;
9
+ readonly allowMultiSelect?: boolean;
10
+ readonly customPickerAction?: ShowCustomFilePickerCallback;
11
+ }
3
12
  /**
4
- * Creates a stylized file input.
13
+ * Creates a stylized file input. This file input can either use the system file picker, or a custom
14
+ * one specified by `customPickerAction`.
5
15
  */
6
- declare const makeFileInput: (labelText: string, context: ToolbarContext, accepts?: string) => {
16
+ declare const makeFileInput: (labelText: string, context: ToolbarContext, { accepts, allowMultiSelect, customPickerAction }?: FileInputOptions) => {
7
17
  container: HTMLDivElement;
8
18
  input: HTMLInputElement;
9
19
  selectedFiles: MutableReactiveValue<File[]>;
@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const ReactiveValue_1 = __importDefault(require("../../../util/ReactiveValue"));
7
7
  let idCounter = 0;
8
8
  /**
9
- * Creates a stylized file input.
9
+ * Creates a stylized file input. This file input can either use the system file picker, or a custom
10
+ * one specified by `customPickerAction`.
10
11
  */
11
- const makeFileInput = (labelText, context, accepts = '*') => {
12
+ const makeFileInput = (labelText, context, { accepts = '*', allowMultiSelect = false, customPickerAction } = {}) => {
12
13
  const container = document.createElement('div');
13
14
  const label = document.createElement('label');
14
15
  const input = document.createElement('input');
@@ -18,7 +19,9 @@ const makeFileInput = (labelText, context, accepts = '*') => {
18
19
  container.classList.add('toolbar--file-input-container');
19
20
  label.appendChild(document.createTextNode(labelText));
20
21
  input.accept = accepts;
21
- input.type = 'file';
22
+ input.type = customPickerAction ? 'button' : 'file';
23
+ input.classList.add('file-input');
24
+ input.multiple = allowMultiSelect;
22
25
  // Associate the label with the input
23
26
  const inputId = `js-draw-file-input-${idCounter++}`;
24
27
  input.setAttribute('id', inputId);
@@ -29,48 +32,22 @@ const makeFileInput = (labelText, context, accepts = '*') => {
29
32
  label.appendChild(descriptionBox);
30
33
  container.replaceChildren(label, input);
31
34
  const selectedFiles = ReactiveValue_1.default.fromInitialValue([]);
32
- // Support droping files
33
- label.addEventListener('dragover', event => {
34
- event.preventDefault();
35
- label.classList.add('drag-target');
36
- });
37
- label.addEventListener('dragenter', event => {
38
- event.preventDefault();
39
- label.classList.add('drag-target');
40
- });
41
- label.addEventListener('dragleave', event => {
42
- event.preventDefault();
43
- // Ensure the event wasn't targeting a child.
44
- // See https://stackoverflow.com/a/54271161 and
45
- // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/relatedTarget
46
- const enteringElement = event.relatedTarget;
47
- if (!enteringElement || !label.contains(enteringElement)) {
48
- label.classList.remove('drag-target');
49
- }
50
- });
51
- // See https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop#process_the_drop
52
- label.addEventListener('drop', event => {
53
- event.preventDefault();
54
- label.classList.remove('drag-target');
55
- const fileList = [];
56
- if (event.dataTransfer) {
57
- fileList.push(...event.dataTransfer.files);
58
- }
59
- selectedFiles.set(fileList);
60
- });
61
- input.addEventListener('change', () => {
62
- const fileList = input.files ?? [];
63
- selectedFiles.set([...fileList]);
64
- });
65
- selectedFiles.onUpdate(files => {
66
- if (files.length === 0 && input.files && input.files.length > 0) {
67
- input.value = '';
35
+ let loading = false;
36
+ let cancelLoading = null;
37
+ const updateStatusText = () => {
38
+ const files = selectedFiles.get();
39
+ if (loading) {
40
+ descriptionText.textContent = context.localization.fileInput__loading;
41
+ if (cancelLoading) {
42
+ const cancelText = document.createElement('b');
43
+ cancelText.textContent = context.localization.cancel;
44
+ cancelText.classList.add('cancel-button');
45
+ descriptionText.appendChild(cancelText);
46
+ }
47
+ icon.style.display = 'none';
68
48
  }
69
- });
70
- // Update the status text and hide/show the icon.
71
- selectedFiles.onUpdateAndNow(files => {
72
- if (files.length > 0) {
73
- descriptionText.innerText = files.map(file => file.name).join('\n');
49
+ else if (files.length > 0) {
50
+ descriptionText.textContent = files.map(file => file.name).join('\n');
74
51
  // Only show the icon when there are files
75
52
  icon.style.display = 'none';
76
53
  }
@@ -90,7 +67,7 @@ const makeFileInput = (labelText, context, accepts = '*') => {
90
67
  // Inside a {{pair of curly braces}}?
91
68
  if (i % 2 === 1) {
92
69
  const boldedText = document.createElement('b');
93
- boldedText.innerText = segments[i];
70
+ boldedText.textContent = segments[i];
94
71
  descriptionText.appendChild(boldedText);
95
72
  }
96
73
  else {
@@ -98,7 +75,87 @@ const makeFileInput = (labelText, context, accepts = '*') => {
98
75
  }
99
76
  }
100
77
  }
78
+ };
79
+ const addFileEventListeners = () => {
80
+ // Support dropping files
81
+ label.addEventListener('dragover', event => {
82
+ event.preventDefault();
83
+ label.classList.add('drag-target');
84
+ });
85
+ label.addEventListener('dragenter', event => {
86
+ event.preventDefault();
87
+ label.classList.add('drag-target');
88
+ });
89
+ label.addEventListener('dragleave', event => {
90
+ event.preventDefault();
91
+ // Ensure the event wasn't targeting a child.
92
+ // See https://stackoverflow.com/a/54271161 and
93
+ // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/relatedTarget
94
+ const enteringElement = event.relatedTarget;
95
+ if (!enteringElement || !label.contains(enteringElement)) {
96
+ label.classList.remove('drag-target');
97
+ }
98
+ });
99
+ // See https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop#process_the_drop
100
+ label.addEventListener('drop', event => {
101
+ event.preventDefault();
102
+ label.classList.remove('drag-target');
103
+ const fileList = [];
104
+ if (event.dataTransfer) {
105
+ fileList.push(...event.dataTransfer.files);
106
+ }
107
+ selectedFiles.set(fileList);
108
+ });
109
+ input.addEventListener('change', () => {
110
+ const fileList = input.files ?? [];
111
+ selectedFiles.set([...fileList]);
112
+ });
113
+ };
114
+ addFileEventListeners();
115
+ // Support for custom file pickers
116
+ if (customPickerAction) {
117
+ const promptForFiles = async () => {
118
+ if (loading) {
119
+ cancelLoading?.();
120
+ return;
121
+ }
122
+ container.classList.add('-loading');
123
+ loading = true;
124
+ updateStatusText();
125
+ try {
126
+ const data = await customPickerAction({
127
+ setOnCancelCallback: (onCancel) => {
128
+ if (!loading) {
129
+ throw new Error('Task already completed. Can\'t register cancel handler.');
130
+ }
131
+ cancelLoading = () => {
132
+ cancelLoading = null;
133
+ updateStatusText();
134
+ onCancel();
135
+ };
136
+ updateStatusText();
137
+ },
138
+ });
139
+ if (data) {
140
+ selectedFiles.set(data);
141
+ }
142
+ }
143
+ finally {
144
+ container.classList.remove('-loading');
145
+ loading = false;
146
+ updateStatusText();
147
+ }
148
+ };
149
+ input.onclick = promptForFiles;
150
+ }
151
+ selectedFiles.onUpdate(files => {
152
+ if (files.length === 0 && input.files && input.files.length > 0) {
153
+ input.value = '';
154
+ }
155
+ cancelLoading?.();
101
156
  });
157
+ // Update the status text and hide/show the icon.
158
+ selectedFiles.onUpdateAndNow(updateStatusText);
102
159
  return {
103
160
  container,
104
161
  input,
@@ -0,0 +1,15 @@
1
+ import { ReactiveValue } from '../../../util/ReactiveValue';
2
+ export interface SnappedListItem<DataType> {
3
+ element: HTMLElement;
4
+ data: DataType;
5
+ }
6
+ type SnappedListItems<DataType> = Array<SnappedListItem<DataType>>;
7
+ export interface SnappedListControl<DataType> {
8
+ container: HTMLElement;
9
+ visibleItem: ReactiveValue<DataType | null>;
10
+ }
11
+ /**
12
+ * Creates a list that snaps to each item and reports the selected item.
13
+ */
14
+ declare const makeSnappedList: <DataType>(itemsValue: ReactiveValue<SnappedListItems<DataType>>) => SnappedListControl<DataType>;
15
+ export default makeSnappedList;