@bensitu/image-editor 2.1.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +305 -95
- package/dist/cjs/index.cjs +3460 -843
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/esm/annotation/annotation-lock.js +7 -0
- package/dist/esm/annotation/annotation-lock.js.map +1 -0
- package/dist/esm/annotation/annotation-manager.js +217 -0
- package/dist/esm/annotation/annotation-manager.js.map +1 -0
- package/dist/esm/annotation/annotation-style.js +50 -0
- package/dist/esm/annotation/annotation-style.js.map +1 -0
- package/dist/esm/annotation/draw-controller.js +114 -0
- package/dist/esm/annotation/draw-controller.js.map +1 -0
- package/dist/esm/annotation/text-controller.js +234 -0
- package/dist/esm/annotation/text-controller.js.map +1 -0
- package/dist/esm/core/default-options.js +240 -9
- package/dist/esm/core/default-options.js.map +1 -1
- package/dist/esm/core/editor-object-kind.js +37 -0
- package/dist/esm/core/editor-object-kind.js.map +1 -0
- package/dist/esm/core/errors.js +19 -0
- package/dist/esm/core/errors.js.map +1 -1
- package/dist/esm/core/layer-order.js +100 -0
- package/dist/esm/core/layer-order.js.map +1 -0
- package/dist/esm/core/public-types.js +34 -1
- package/dist/esm/core/public-types.js.map +1 -1
- package/dist/esm/core/state-serializer.js +112 -24
- package/dist/esm/core/state-serializer.js.map +1 -1
- package/dist/esm/crop/crop-controller.js +220 -10
- package/dist/esm/crop/crop-controller.js.map +1 -1
- package/dist/esm/export/export-format.js.map +1 -1
- package/dist/esm/export/export-service.js +157 -168
- package/dist/esm/export/export-service.js.map +1 -1
- package/dist/esm/export/overlay-merge-service.js +75 -0
- package/dist/esm/export/overlay-merge-service.js.map +1 -0
- package/dist/esm/history/history-manager.js +2 -2
- package/dist/esm/history/history-manager.js.map +1 -1
- package/dist/esm/image/image-loader.js +20 -51
- package/dist/esm/image/image-loader.js.map +1 -1
- package/dist/esm/image/transform-controller.js +42 -0
- package/dist/esm/image/transform-controller.js.map +1 -1
- package/dist/esm/image-editor.js +1200 -72
- package/dist/esm/image-editor.js.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mask/mask-factory.js +39 -14
- package/dist/esm/mask/mask-factory.js.map +1 -1
- package/dist/esm/mask/mask-label-manager.js +2 -0
- package/dist/esm/mask/mask-label-manager.js.map +1 -1
- package/dist/esm/mask/mask-list.js.map +1 -1
- package/dist/esm/mask/mask-style.js.map +1 -1
- package/dist/esm/mosaic/mosaic-controller.js +24 -28
- package/dist/esm/mosaic/mosaic-controller.js.map +1 -1
- package/dist/esm/utils/file.js +10 -0
- package/dist/esm/utils/file.js.map +1 -1
- package/dist/esm/utils/image-element-loader.js +55 -0
- package/dist/esm/utils/image-element-loader.js.map +1 -0
- package/dist/esm/utils/pointer.js +28 -0
- package/dist/esm/utils/pointer.js.map +1 -0
- package/dist/types/annotation/annotation-lock.d.ts +12 -0
- package/dist/types/annotation/annotation-lock.d.ts.map +1 -0
- package/dist/types/annotation/annotation-manager.d.ts +33 -0
- package/dist/types/annotation/annotation-manager.d.ts.map +1 -0
- package/dist/types/annotation/annotation-style.d.ts +13 -0
- package/dist/types/annotation/annotation-style.d.ts.map +1 -0
- package/dist/types/annotation/draw-controller.d.ts +43 -0
- package/dist/types/annotation/draw-controller.d.ts.map +1 -0
- package/dist/types/annotation/text-controller.d.ts +47 -0
- package/dist/types/annotation/text-controller.d.ts.map +1 -0
- package/dist/types/core/default-options.d.ts +14 -2
- package/dist/types/core/default-options.d.ts.map +1 -1
- package/dist/types/core/editor-object-kind.d.ts +29 -0
- package/dist/types/core/editor-object-kind.d.ts.map +1 -0
- package/dist/types/core/errors.d.ts +11 -1
- package/dist/types/core/errors.d.ts.map +1 -1
- package/dist/types/core/layer-order.d.ts +21 -0
- package/dist/types/core/layer-order.d.ts.map +1 -0
- package/dist/types/core/public-types.d.ts +272 -56
- package/dist/types/core/public-types.d.ts.map +1 -1
- package/dist/types/core/state-serializer.d.ts +34 -5
- package/dist/types/core/state-serializer.d.ts.map +1 -1
- package/dist/types/crop/crop-controller.d.ts +18 -14
- package/dist/types/crop/crop-controller.d.ts.map +1 -1
- package/dist/types/export/export-format.d.ts +9 -40
- package/dist/types/export/export-format.d.ts.map +1 -1
- package/dist/types/export/export-service.d.ts +45 -41
- package/dist/types/export/export-service.d.ts.map +1 -1
- package/dist/types/export/overlay-merge-service.d.ts +38 -0
- package/dist/types/export/overlay-merge-service.d.ts.map +1 -0
- package/dist/types/history/history-manager.d.ts +11 -14
- package/dist/types/history/history-manager.d.ts.map +1 -1
- package/dist/types/image/image-loader.d.ts +27 -22
- package/dist/types/image/image-loader.d.ts.map +1 -1
- package/dist/types/image/image-resampler.d.ts +1 -1
- package/dist/types/image/transform-controller.d.ts +19 -14
- package/dist/types/image/transform-controller.d.ts.map +1 -1
- package/dist/types/image-editor.d.ts +93 -15
- package/dist/types/image-editor.d.ts.map +1 -1
- package/dist/types/index.d.cts +3 -3
- package/dist/types/index.d.cts.map +1 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/mask/mask-factory.d.ts.map +1 -1
- package/dist/types/mask/mask-label-manager.d.ts +10 -9
- package/dist/types/mask/mask-label-manager.d.ts.map +1 -1
- package/dist/types/mask/mask-list.d.ts +11 -12
- package/dist/types/mask/mask-list.d.ts.map +1 -1
- package/dist/types/mask/mask-style.d.ts +19 -20
- package/dist/types/mask/mask-style.d.ts.map +1 -1
- package/dist/types/mosaic/mosaic-controller.d.ts +3 -3
- package/dist/types/mosaic/mosaic-controller.d.ts.map +1 -1
- package/dist/types/ui/visibility-state.d.ts +2 -2
- package/dist/types/utils/file.d.ts +13 -0
- package/dist/types/utils/file.d.ts.map +1 -1
- package/dist/types/utils/image-element-loader.d.ts +19 -0
- package/dist/types/utils/image-element-loader.d.ts.map +1 -0
- package/dist/types/utils/pointer.d.ts +16 -0
- package/dist/types/utils/pointer.d.ts.map +1 -0
- package/dist/umd/image-editor.umd.js +1 -1
- package/dist/umd/image-editor.umd.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { MergeAnnotationsError, MergeMasksError } from '../core/errors.js';
|
|
2
|
+
import { normalizeLayerOrder } from '../core/layer-order.js';
|
|
3
|
+
import { Command } from '../history/history-manager.js';
|
|
4
|
+
function createMergeError(operation, error) {
|
|
5
|
+
if (operation === 'mergeAnnotations') {
|
|
6
|
+
if (error instanceof MergeAnnotationsError)
|
|
7
|
+
return error;
|
|
8
|
+
const message = error instanceof Error
|
|
9
|
+
? `mergeAnnotations failed: ${error.message}`
|
|
10
|
+
: 'mergeAnnotations failed';
|
|
11
|
+
return new MergeAnnotationsError(message, error);
|
|
12
|
+
}
|
|
13
|
+
if (error instanceof MergeMasksError)
|
|
14
|
+
return error;
|
|
15
|
+
const message = error instanceof Error ? `mergeMasks failed: ${error.message}` : 'mergeMasks failed';
|
|
16
|
+
return new MergeMasksError(message, error);
|
|
17
|
+
}
|
|
18
|
+
function detachObjects(canvas, objects) {
|
|
19
|
+
for (const object of objects) {
|
|
20
|
+
if (!canvas.getObjects().includes(object))
|
|
21
|
+
continue;
|
|
22
|
+
canvas.remove(object);
|
|
23
|
+
}
|
|
24
|
+
canvas.discardActiveObject();
|
|
25
|
+
canvas.renderAll();
|
|
26
|
+
}
|
|
27
|
+
export async function flattenOverlayGroupToBaseImage(context, options) {
|
|
28
|
+
if (!context.isImageLoaded())
|
|
29
|
+
return;
|
|
30
|
+
if (options.getTargets().length === 0)
|
|
31
|
+
return;
|
|
32
|
+
const beforeSnapshot = context.captureSnapshot();
|
|
33
|
+
const preservedObjects = options.getPreservedObjects();
|
|
34
|
+
const preScrollTop = context.containerElement ? context.containerElement.scrollTop : null;
|
|
35
|
+
const preScrollLeft = context.containerElement ? context.containerElement.scrollLeft : null;
|
|
36
|
+
try {
|
|
37
|
+
detachObjects(context.canvas, preservedObjects);
|
|
38
|
+
const exportedDataUrl = await context.exportImageBase64(options.exportOptions);
|
|
39
|
+
if (!exportedDataUrl) {
|
|
40
|
+
throw createMergeError(options.operation, `${options.operation}: exportImageBase64 returned an empty data URL.`);
|
|
41
|
+
}
|
|
42
|
+
options.removeTargetsNoHistory();
|
|
43
|
+
await context.loadImage(exportedDataUrl, { preserveScroll: true });
|
|
44
|
+
await options.restorePreservedObjects(preservedObjects);
|
|
45
|
+
normalizeLayerOrder(context.canvas);
|
|
46
|
+
context.canvas.renderAll();
|
|
47
|
+
context.updateInputs();
|
|
48
|
+
context.updateUi();
|
|
49
|
+
if (context.containerElement) {
|
|
50
|
+
try {
|
|
51
|
+
if (preScrollTop !== null)
|
|
52
|
+
context.containerElement.scrollTop = preScrollTop;
|
|
53
|
+
if (preScrollLeft !== null)
|
|
54
|
+
context.containerElement.scrollLeft = preScrollLeft;
|
|
55
|
+
}
|
|
56
|
+
catch (scrollError) {
|
|
57
|
+
console.warn(`[ImageEditor] ${options.operation}: scroll restore failed`, scrollError);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
const afterSnapshot = context.captureSnapshot();
|
|
61
|
+
if (beforeSnapshot && afterSnapshot && beforeSnapshot !== afterSnapshot) {
|
|
62
|
+
context.historyManager.push(new Command(() => context.loadFromState(afterSnapshot), () => context.loadFromState(beforeSnapshot)));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
try {
|
|
67
|
+
await context.loadFromState(beforeSnapshot);
|
|
68
|
+
}
|
|
69
|
+
catch (rollbackError) {
|
|
70
|
+
console.warn(`[ImageEditor] ${options.operation}: rollback failed`, rollbackError);
|
|
71
|
+
}
|
|
72
|
+
throw createMergeError(options.operation, error);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=overlay-merge-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"overlay-merge-service.js","sourceRoot":"","sources":["../../../src/export/overlay-merge-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-manager.js","sourceRoot":"","sources":["../../../src/history/history-manager.ts"],"names":[],"mappings":"AAwDA,MAAM,OAAO,OAAO;IAMhB,YAAY,OAA4B,EAAE,IAAyB;QAJ1D;;;;;WAA6B;QAE7B;;;;;WAA0B;QAG/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAMD,MAAM,OAAO,cAAc;IAYvB,YAAY,UAAkB,EAAE;QAXxB;;;;mBAAqB,EAAE;WAAC;QACxB;;;;mBAAe,CAAC,CAAC;WAAC;QAClB;;;;mBAAe,KAAK;WAAC;QAGpB;;;;;WAAgB;QAOrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"history-manager.js","sourceRoot":"","sources":["../../../src/history/history-manager.ts"],"names":[],"mappings":"AAwDA,MAAM,OAAO,OAAO;IAMhB,YAAY,OAA4B,EAAE,IAAyB;QAJ1D;;;;;WAA6B;QAE7B;;;;;WAA0B;QAG/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAMD,MAAM,OAAO,cAAc;IAYvB,YAAY,UAAkB,EAAE;QAXxB;;;;mBAAqB,EAAE;WAAC;QACxB;;;;mBAAe,CAAC,CAAC;WAAC;QAClB;;;;mBAAe,KAAK;WAAC;QAGpB;;;;;WAAgB;QAOrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IASD,KAAK,CAAC,OAAO,CAAC,OAAgB;QAC1B,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAOD,IAAI,CAAC,OAAgB;QACjB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAGD,OAAO;QACH,OAAO,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;IAClC,CAAC;IAGD,OAAO;QACH,OAAO,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACvD,CAAC;IAYD,KAAK,CAAC,IAAI;QACN,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5C,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAEjB,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC9B,CAAC;IACL,CAAC;IASD,KAAK,CAAC,IAAI;QACN,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;YAEpB,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC9B,CAAC;IACL,CAAC;IAWO,WAAW,CAAC,OAAgB;QAEhC,IAAI,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAGrC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { reportError, reportWarning } from '../core/callback-reporter.js';
|
|
2
|
+
import { markBaseImageObject } from '../core/editor-object-kind.js';
|
|
2
3
|
import { ImageDecodeError } from '../core/errors.js';
|
|
3
4
|
import { saveState, SNAPSHOT_CUSTOM_KEYS } from '../core/state-serializer.js';
|
|
5
|
+
import { isSupportedImageDataUrl } from '../utils/file.js';
|
|
6
|
+
import { startImageElementLoad } from '../utils/image-element-loader.js';
|
|
4
7
|
import { withTimeout } from '../utils/timeout.js';
|
|
5
8
|
import { computeCoverLayout, computeExpandLayout, computeFitLayout, selectLayoutStrategy, applyCanvasDimensions, measureScrollbarSize, } from './layout-manager.js';
|
|
6
9
|
import { computeDownsampleDimensions, detectSourceMimeType, resampleImage, } from './image-resampler.js';
|
|
7
10
|
export async function loadImage(context, imageBase64, loadOptions = {}) {
|
|
8
|
-
if (
|
|
11
|
+
if (!isSupportedImageDataUrl(imageBase64))
|
|
9
12
|
return;
|
|
10
|
-
}
|
|
11
13
|
const placeholderHidden = context.placeholderElement
|
|
12
14
|
? !!context.placeholderElement.hidden
|
|
13
15
|
: null;
|
|
@@ -24,6 +26,7 @@ export async function loadImage(context, imageBase64, loadOptions = {}) {
|
|
|
24
26
|
lastSnapshot: context.getLastSnapshot(),
|
|
25
27
|
canvasJson: serializeCanvas(context.canvas),
|
|
26
28
|
maskCounter: context.getMaskCounter(),
|
|
29
|
+
annotationCounter: context.getAnnotationCounter(),
|
|
27
30
|
currentScale: context.getCurrentScale(),
|
|
28
31
|
currentRotation: context.getCurrentRotation(),
|
|
29
32
|
baseImageScale: context.getBaseImageScale(),
|
|
@@ -45,23 +48,25 @@ export async function loadImage(context, imageBase64, loadOptions = {}) {
|
|
|
45
48
|
context.canvas.discardActiveObject();
|
|
46
49
|
context.canvas.clear();
|
|
47
50
|
context.canvas.backgroundColor = context.options.backgroundColor;
|
|
48
|
-
fabricImage
|
|
51
|
+
const baseImage = markBaseImageObject(fabricImage);
|
|
52
|
+
baseImage.set({
|
|
49
53
|
originX: 'left',
|
|
50
54
|
originY: 'top',
|
|
51
55
|
selectable: false,
|
|
52
56
|
evented: false,
|
|
53
57
|
});
|
|
54
|
-
const layout = computeLayout(context,
|
|
58
|
+
const layout = computeLayout(context, baseImage);
|
|
55
59
|
applyCanvasDimensions(context.canvas, layout.canvasWidth, layout.canvasHeight, context.containerElement);
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
context.canvas.add(
|
|
59
|
-
context.canvas.sendObjectToBack(
|
|
60
|
-
context.setOriginalImage(
|
|
60
|
+
baseImage.set({ left: layout.imageLeft, top: layout.imageTop });
|
|
61
|
+
baseImage.scale(layout.imageScale);
|
|
62
|
+
context.canvas.add(baseImage);
|
|
63
|
+
context.canvas.sendObjectToBack(baseImage);
|
|
64
|
+
context.setOriginalImage(baseImage);
|
|
61
65
|
context.setBaseImageScale(layout.baseImageScale);
|
|
62
66
|
context.setCurrentScale(1);
|
|
63
67
|
context.setCurrentRotation(0);
|
|
64
68
|
context.setMaskCounter(0);
|
|
69
|
+
context.setAnnotationCounter(0);
|
|
65
70
|
context.setIsImageLoadedToCanvas(true);
|
|
66
71
|
context.setCurrentImageMimeType(loadSource.mimeType);
|
|
67
72
|
context.canvas.renderAll();
|
|
@@ -94,49 +99,12 @@ export async function loadImage(context, imageBase64, loadOptions = {}) {
|
|
|
94
99
|
}
|
|
95
100
|
}
|
|
96
101
|
function startImageDecode(dataUrl) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
imageElement.onload = null;
|
|
105
|
-
imageElement.onerror = null;
|
|
106
|
-
}
|
|
107
|
-
if (clearSource) {
|
|
108
|
-
imageElement.src = '';
|
|
109
|
-
}
|
|
110
|
-
};
|
|
111
|
-
const handleLoad = () => {
|
|
112
|
-
if (!hasNaturalImageDimensions(imageElement)) {
|
|
113
|
-
cleanup(true);
|
|
114
|
-
rejectImage(new ImageDecodeError('Failed to decode image data URL: image has no natural dimensions.', null));
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
|
-
cleanup(false);
|
|
118
|
-
resolveImage(imageElement);
|
|
119
|
-
};
|
|
120
|
-
const handleError = (e) => {
|
|
121
|
-
cleanup(true);
|
|
122
|
-
rejectImage(new ImageDecodeError('Failed to decode image data URL.', e));
|
|
123
|
-
};
|
|
124
|
-
let resolveImage;
|
|
125
|
-
let rejectImage;
|
|
126
|
-
const promise = new Promise((resolve, reject) => {
|
|
127
|
-
resolveImage = resolve;
|
|
128
|
-
rejectImage = reject;
|
|
129
|
-
if (typeof imageElement.addEventListener === 'function') {
|
|
130
|
-
imageElement.addEventListener('load', handleLoad, { once: true });
|
|
131
|
-
imageElement.addEventListener('error', handleError, { once: true });
|
|
132
|
-
}
|
|
133
|
-
else {
|
|
134
|
-
imageElement.onload = handleLoad;
|
|
135
|
-
imageElement.onerror = handleError;
|
|
136
|
-
}
|
|
137
|
-
imageElement.src = dataUrl;
|
|
102
|
+
return startImageElementLoad(dataUrl, {
|
|
103
|
+
validate: (imageElement) => hasNaturalImageDimensions(imageElement)
|
|
104
|
+
? null
|
|
105
|
+
: new ImageDecodeError('Failed to decode image data URL: image has no natural dimensions.', null),
|
|
106
|
+
createError: (event) => new ImageDecodeError('Failed to decode image data URL.', event),
|
|
138
107
|
});
|
|
139
|
-
return { promise, cleanup };
|
|
140
108
|
}
|
|
141
109
|
function hasNaturalImageDimensions(imageElement) {
|
|
142
110
|
return (Number.isFinite(imageElement.naturalWidth) &&
|
|
@@ -214,6 +182,7 @@ async function replayRollback(context, bundle) {
|
|
|
214
182
|
context.setIsImageLoadedToCanvas(bundle.isImageLoadedToCanvas);
|
|
215
183
|
context.setLastSnapshot(bundle.lastSnapshot);
|
|
216
184
|
context.setMaskCounter(bundle.maskCounter);
|
|
185
|
+
context.setAnnotationCounter(bundle.annotationCounter);
|
|
217
186
|
context.setCurrentScale(bundle.currentScale);
|
|
218
187
|
context.setCurrentRotation(bundle.currentRotation);
|
|
219
188
|
context.setBaseImageScale(bundle.baseImageScale);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-loader.js","sourceRoot":"","sources":["../../../src/image/image-loader.ts"],"names":[],"mappings":"AAuGA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACH,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,GAGvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,2BAA2B,EAC3B,oBAAoB,EACpB,aAAa,GAChB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"image-loader.js","sourceRoot":"","sources":["../../../src/image/image-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,6 +104,41 @@ export class TransformController {
|
|
|
104
104
|
}
|
|
105
105
|
this.context.saveCanvasState();
|
|
106
106
|
}
|
|
107
|
+
async flipHorizontal() {
|
|
108
|
+
await this.flipImage('flipX');
|
|
109
|
+
}
|
|
110
|
+
async flipVertical() {
|
|
111
|
+
await this.flipImage('flipY');
|
|
112
|
+
}
|
|
113
|
+
async flipImage(property) {
|
|
114
|
+
const imageObject = this.context.getOriginalImage();
|
|
115
|
+
if (!imageObject)
|
|
116
|
+
return;
|
|
117
|
+
if (this.context.guard.isAnimating())
|
|
118
|
+
return;
|
|
119
|
+
if (this.context.guard.isDisposed())
|
|
120
|
+
return;
|
|
121
|
+
try {
|
|
122
|
+
const centre = imageObject.getCenterPoint();
|
|
123
|
+
imageObject.set({ originX: 'center', originY: 'center' });
|
|
124
|
+
imageObject.setPositionByOrigin(centre, 'center', 'center');
|
|
125
|
+
imageObject.set({ [property]: !imageObject[property] });
|
|
126
|
+
imageObject.setCoords();
|
|
127
|
+
const newTopLeft = computeTopLeftPoint(imageObject);
|
|
128
|
+
imageObject.set({ originX: 'left', originY: 'top' });
|
|
129
|
+
imageObject.setPositionByOrigin(newTopLeft, 'left', 'top');
|
|
130
|
+
imageObject.setCoords();
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
console.warn(`[ImageEditor] ${property === 'flipX' ? 'flipHorizontal' : 'flipVertical'} failed`, error);
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
if (this.context.guard.isDisposed())
|
|
137
|
+
return;
|
|
138
|
+
if (this.context.afterTransformSnap)
|
|
139
|
+
this.context.afterTransformSnap();
|
|
140
|
+
this.context.saveCanvasState();
|
|
141
|
+
}
|
|
107
142
|
async resetImageTransform() {
|
|
108
143
|
if (!this.context.getOriginalImage())
|
|
109
144
|
return;
|
|
@@ -111,6 +146,13 @@ export class TransformController {
|
|
|
111
146
|
try {
|
|
112
147
|
await this.scaleImage(1);
|
|
113
148
|
await this.rotateImage(0);
|
|
149
|
+
const imageObject = this.context.getOriginalImage();
|
|
150
|
+
if (imageObject && !this.context.guard.isDisposed()) {
|
|
151
|
+
imageObject.set({ flipX: false, flipY: false });
|
|
152
|
+
imageObject.setCoords();
|
|
153
|
+
if (this.context.afterTransformSnap)
|
|
154
|
+
this.context.afterTransformSnap();
|
|
155
|
+
}
|
|
114
156
|
}
|
|
115
157
|
finally {
|
|
116
158
|
this.context.setSuppressSaveState(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-controller.js","sourceRoot":"","sources":["../../../src/image/transform-controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transform-controller.js","sourceRoot":"","sources":["../../../src/image/transform-controller.ts"],"names":[],"mappings":"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"}
|