js-draw 1.18.0 → 1.19.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (134) hide show
  1. package/dist/Editor.css +35 -3
  2. package/dist/bundle.js +2 -2
  3. package/dist/bundledStyles.js +1 -1
  4. package/dist/cjs/Editor.d.ts +20 -1
  5. package/dist/cjs/Editor.js +6 -0
  6. package/dist/cjs/{SVGLoader.d.ts → SVGLoader/index.d.ts} +1 -1
  7. package/dist/cjs/{SVGLoader.js → SVGLoader/index.js} +12 -29
  8. package/dist/cjs/SVGLoader/utils/determineFontSize.d.ts +3 -0
  9. package/dist/cjs/SVGLoader/utils/determineFontSize.js +27 -0
  10. package/dist/cjs/Viewport.d.ts +33 -1
  11. package/dist/cjs/components/TextComponent.js +3 -1
  12. package/dist/cjs/rendering/caching/RenderingCacheNode.js +20 -15
  13. package/dist/cjs/testing/findNodeWithText.d.ts +3 -0
  14. package/dist/cjs/testing/findNodeWithText.js +16 -0
  15. package/dist/cjs/testing/firstElementAncestorOfNode.d.ts +3 -0
  16. package/dist/cjs/testing/firstElementAncestorOfNode.js +13 -0
  17. package/dist/cjs/testing/sendKeyPressRelease.d.ts +3 -0
  18. package/dist/cjs/testing/sendKeyPressRelease.js +8 -0
  19. package/dist/cjs/testing/sendPenEvent.d.ts +2 -2
  20. package/dist/cjs/testing/sendPenEvent.js +26 -3
  21. package/dist/cjs/toolbar/localization.d.ts +2 -0
  22. package/dist/cjs/toolbar/localization.js +2 -0
  23. package/dist/cjs/toolbar/widgets/BaseWidget.d.ts +1 -0
  24. package/dist/cjs/toolbar/widgets/BaseWidget.js +1 -0
  25. package/dist/cjs/toolbar/widgets/InsertImageWidget/ImageWrapper.d.ts +22 -0
  26. package/dist/cjs/toolbar/widgets/InsertImageWidget/ImageWrapper.js +58 -0
  27. package/dist/cjs/toolbar/widgets/InsertImageWidget/fileToImages.d.ts +3 -0
  28. package/dist/cjs/toolbar/widgets/InsertImageWidget/fileToImages.js +21 -0
  29. package/dist/cjs/toolbar/widgets/InsertImageWidget/index.d.ts +37 -0
  30. package/dist/cjs/toolbar/widgets/InsertImageWidget/index.js +281 -0
  31. package/dist/cjs/toolbar/widgets/TextToolWidget.js +5 -3
  32. package/dist/cjs/toolbar/widgets/TextToolWidget.test.d.ts +1 -0
  33. package/dist/cjs/toolbar/widgets/components/makeFileInput.d.ts +12 -2
  34. package/dist/cjs/toolbar/widgets/components/makeFileInput.js +102 -45
  35. package/dist/cjs/toolbar/widgets/components/makeFileInput.test.d.ts +1 -0
  36. package/dist/cjs/toolbar/widgets/components/makeSnappedList.d.ts +15 -0
  37. package/dist/cjs/toolbar/widgets/components/makeSnappedList.js +103 -0
  38. package/dist/cjs/tools/Eraser.d.ts +7 -2
  39. package/dist/cjs/tools/Eraser.js +54 -1
  40. package/dist/cjs/tools/SelectionTool/Selection.d.ts +2 -2
  41. package/dist/cjs/tools/SelectionTool/Selection.js +20 -20
  42. package/dist/cjs/tools/SelectionTool/SelectionHandle.d.ts +8 -2
  43. package/dist/cjs/tools/SelectionTool/SelectionHandle.js +6 -0
  44. package/dist/cjs/tools/SelectionTool/SelectionTool.js +1 -1
  45. package/dist/cjs/tools/SelectionTool/types.d.ts +19 -0
  46. package/dist/cjs/tools/TextTool.js +2 -1
  47. package/dist/cjs/tools/TextTool.test.d.ts +1 -0
  48. package/dist/cjs/tools/ToolController.d.ts +2 -0
  49. package/dist/cjs/tools/ToolController.js +10 -1
  50. package/dist/cjs/util/ReactiveValue.d.ts +2 -0
  51. package/dist/cjs/util/ReactiveValue.js +11 -0
  52. package/dist/cjs/util/bytesToSizeString.d.ts +8 -0
  53. package/dist/cjs/util/bytesToSizeString.js +26 -0
  54. package/dist/cjs/util/bytesToSizeString.test.d.ts +1 -0
  55. package/dist/cjs/util/stopPropagationOfScrollingWheelEvents.js +10 -6
  56. package/dist/cjs/util/waitForAll.d.ts +2 -0
  57. package/dist/cjs/util/waitForAll.js +2 -0
  58. package/dist/cjs/util/waitForImageLoaded.js +3 -0
  59. package/dist/cjs/util/waitForTimeout.d.ts +1 -0
  60. package/dist/cjs/util/waitForTimeout.js +1 -1
  61. package/dist/cjs/version.js +1 -1
  62. package/dist/mjs/Editor.d.ts +20 -1
  63. package/dist/mjs/Editor.mjs +6 -0
  64. package/dist/mjs/{SVGLoader.d.ts → SVGLoader/index.d.ts} +1 -1
  65. package/dist/mjs/{SVGLoader.mjs → SVGLoader/index.mjs} +12 -29
  66. package/dist/mjs/SVGLoader/index.test.d.ts +1 -0
  67. package/dist/mjs/SVGLoader/utils/determineFontSize.d.ts +3 -0
  68. package/dist/mjs/SVGLoader/utils/determineFontSize.mjs +25 -0
  69. package/dist/mjs/Viewport.d.ts +33 -1
  70. package/dist/mjs/components/TextComponent.mjs +3 -1
  71. package/dist/mjs/rendering/caching/RenderingCacheNode.mjs +20 -15
  72. package/dist/mjs/testing/findNodeWithText.d.ts +3 -0
  73. package/dist/mjs/testing/findNodeWithText.mjs +14 -0
  74. package/dist/mjs/testing/firstElementAncestorOfNode.d.ts +3 -0
  75. package/dist/mjs/testing/firstElementAncestorOfNode.mjs +11 -0
  76. package/dist/mjs/testing/sendKeyPressRelease.d.ts +3 -0
  77. package/dist/mjs/testing/sendKeyPressRelease.mjs +6 -0
  78. package/dist/mjs/testing/sendPenEvent.d.ts +2 -2
  79. package/dist/mjs/testing/sendPenEvent.mjs +3 -3
  80. package/dist/mjs/toolbar/localization.d.ts +2 -0
  81. package/dist/mjs/toolbar/localization.mjs +2 -0
  82. package/dist/mjs/toolbar/widgets/BaseWidget.d.ts +1 -0
  83. package/dist/mjs/toolbar/widgets/BaseWidget.mjs +1 -0
  84. package/dist/mjs/toolbar/widgets/InsertImageWidget/ImageWrapper.d.ts +22 -0
  85. package/dist/mjs/toolbar/widgets/InsertImageWidget/ImageWrapper.mjs +54 -0
  86. package/dist/mjs/toolbar/widgets/InsertImageWidget/fileToImages.d.ts +3 -0
  87. package/dist/mjs/toolbar/widgets/InsertImageWidget/fileToImages.mjs +16 -0
  88. package/dist/mjs/toolbar/widgets/InsertImageWidget/index.d.ts +37 -0
  89. package/dist/mjs/toolbar/widgets/InsertImageWidget/index.mjs +276 -0
  90. package/dist/mjs/toolbar/widgets/InsertImageWidget/index.test.d.ts +1 -0
  91. package/dist/mjs/toolbar/widgets/TextToolWidget.mjs +5 -3
  92. package/dist/mjs/toolbar/widgets/TextToolWidget.test.d.ts +1 -0
  93. package/dist/mjs/toolbar/widgets/components/makeFileInput.d.ts +12 -2
  94. package/dist/mjs/toolbar/widgets/components/makeFileInput.mjs +102 -45
  95. package/dist/mjs/toolbar/widgets/components/makeFileInput.test.d.ts +1 -0
  96. package/dist/mjs/toolbar/widgets/components/makeSnappedList.d.ts +15 -0
  97. package/dist/mjs/toolbar/widgets/components/makeSnappedList.mjs +98 -0
  98. package/dist/mjs/tools/Eraser.d.ts +7 -2
  99. package/dist/mjs/tools/Eraser.mjs +54 -1
  100. package/dist/mjs/tools/SelectionTool/Selection.d.ts +2 -2
  101. package/dist/mjs/tools/SelectionTool/Selection.mjs +20 -20
  102. package/dist/mjs/tools/SelectionTool/SelectionHandle.d.ts +8 -2
  103. package/dist/mjs/tools/SelectionTool/SelectionHandle.mjs +6 -0
  104. package/dist/mjs/tools/SelectionTool/SelectionTool.mjs +1 -1
  105. package/dist/mjs/tools/SelectionTool/types.d.ts +19 -0
  106. package/dist/mjs/tools/TextTool.mjs +2 -1
  107. package/dist/mjs/tools/TextTool.test.d.ts +1 -0
  108. package/dist/mjs/tools/ToolController.d.ts +2 -0
  109. package/dist/mjs/tools/ToolController.mjs +10 -1
  110. package/dist/mjs/util/ReactiveValue.d.ts +2 -0
  111. package/dist/mjs/util/ReactiveValue.mjs +11 -0
  112. package/dist/mjs/util/bytesToSizeString.d.ts +8 -0
  113. package/dist/mjs/util/bytesToSizeString.mjs +24 -0
  114. package/dist/mjs/util/bytesToSizeString.test.d.ts +1 -0
  115. package/dist/mjs/util/stopPropagationOfScrollingWheelEvents.mjs +10 -6
  116. package/dist/mjs/util/waitForAll.d.ts +2 -0
  117. package/dist/mjs/util/waitForAll.mjs +2 -0
  118. package/dist/mjs/util/waitForImageLoaded.mjs +3 -0
  119. package/dist/mjs/util/waitForTimeout.d.ts +1 -0
  120. package/dist/mjs/util/waitForTimeout.mjs +1 -1
  121. package/dist/mjs/version.mjs +1 -1
  122. package/package.json +4 -4
  123. package/src/toolbar/toolbar.scss +1 -7
  124. package/src/toolbar/widgets/{InsertImageWidget.scss → InsertImageWidget/index.scss} +3 -2
  125. package/src/toolbar/widgets/components/components.scss +2 -1
  126. package/src/toolbar/widgets/components/makeFileInput.scss +14 -1
  127. package/src/toolbar/widgets/components/makeSnappedList.scss +28 -0
  128. package/src/toolbar/widgets/widgets.scss +7 -0
  129. package/dist/cjs/toolbar/widgets/InsertImageWidget.d.ts +0 -22
  130. package/dist/cjs/toolbar/widgets/InsertImageWidget.js +0 -269
  131. package/dist/mjs/toolbar/widgets/InsertImageWidget.d.ts +0 -22
  132. package/dist/mjs/toolbar/widgets/InsertImageWidget.mjs +0 -264
  133. /package/dist/cjs/{SVGLoader.test.d.ts → SVGLoader/index.test.d.ts} +0 -0
  134. /package/dist/{mjs/SVGLoader.test.d.ts → cjs/toolbar/widgets/InsertImageWidget/index.test.d.ts} +0 -0
@@ -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 = __importDefault(require("../Pointer"));
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 ?? [
@@ -17,6 +17,7 @@ export interface ToolbarLocalization extends ToolbarUtilsLocalization {
17
17
  dragAndDropHereOrBrowse: string;
18
18
  cancel: string;
19
19
  submit: string;
20
+ addAll: string;
20
21
  roundedTipPen: string;
21
22
  roundedTipPen2: string;
22
23
  flatTipPen: string;
@@ -56,6 +57,7 @@ export interface ToolbarLocalization extends ToolbarUtilsLocalization {
56
57
  strokeAutocorrect: string;
57
58
  errorImageHasZeroSize: string;
58
59
  describeTheImage: string;
60
+ fileInput__loading: string;
59
61
  penDropdown__baseHelpText: string;
60
62
  penDropdown__colorHelpText: string;
61
63
  penDropdown__thicknessHelpText: 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',
@@ -60,6 +61,7 @@ exports.defaultToolbarLocalization = {
60
61
  paste: 'Paste',
61
62
  errorImageHasZeroSize: 'Error: Image has zero size',
62
63
  describeTheImage: 'Image description',
64
+ fileInput__loading: 'Loading...',
63
65
  // Help text
64
66
  penDropdown__baseHelpText: 'This tool draws shapes or freehand lines.',
65
67
  penDropdown__colorHelpText: 'Changes the pen\'s color',
@@ -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;
@@ -405,6 +405,7 @@ class BaseWidget {
405
405
  setIsToplevel(toplevel) {
406
406
  this.toplevel = toplevel;
407
407
  }
408
+ /** Returns true if the menu for this widget is open. */
408
409
  isDropdownVisible() {
409
410
  return this.dropdown?.visible?.get() ?? false;
410
411
  }
@@ -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,3 @@
1
+ import type { RenderableImage } from '../../../rendering/renderers/AbstractRenderer';
2
+ declare const fileToImages: (imageFile: File) => Promise<RenderableImage[]>;
3
+ export default fileToImages;
@@ -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
+ }
@@ -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;
@@ -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[]>;