@anu3ev/fabric-image-editor 0.9.24 → 0.9.25

package/dist/main.js

@@ -3404,72 +3404,24 @@ var Ut = class {
 		}
 	}
 	async exportObjectAsImageFile(t = {}) {
-		let { object: n, fileName: r, contentType: i, exportAsBase64: o = !1, exportAsBlob: s = !1 } = t, { canvas: c, workerManager: l } = this.editor, u = n || c.getActiveObject(), d = i ?? "image/png", f = this.getFormatFromContentType(d) || "png", p = r ?? `image.${f}`;
-		if (!u) return this.editor.errorManager.emitError({
+		let { object: n, exportAsBase64: r = !1, exportAsBlob: i = !1 } = t, { canvas: a } = this.editor, o = n || a.getActiveObject(), s = this._createObjectExportRequest({
+			object: o ?? void 0,
+			options: t
+		});
+		if (!e._hasExportObject({ request: s })) return this.editor.errorManager.emitError({
 			origin: "ImageManager",
 			method: "exportObjectAsImageFile",
 			code: "NO_OBJECT_SELECTED",
 			message: "Не выбран объект для экспорта",
 			data: {
-				contentType: d,
-				fileName: p,
-				exportAsBase64: o,
-				exportAsBlob: s
+				contentType: s.contentType,
+				fileName: s.fileName,
+				exportAsBase64: r,
+				exportAsBlob: i
 			}
 		}), null;
-		let { contentType: m, format: h = "" } = u, g = i ?? m ?? "image/png", _ = this.getFormatFromContentType(g) || h || "png", v = r ?? `image.${_}`;
 		try {
-			if (_ === "svg") {
-				let t = u.toSVG(), n = {
-					object: u,
-					image: e._exportSVGStringAsFile(t, {
-						exportAsBase64: o,
-						exportAsBlob: s,
-						fileName: v
-					}),
-					format: _,
-					contentType: "image/svg+xml",
-					fileName: v.replace(/\.[^/.]+$/, ".svg")
-				};
-				return c.fire("editor:object-exported", n), n;
-			}
-			if (o && u instanceof a) {
-				let e = await createImageBitmap(u.getElement()), t = {
-					object: u,
-					image: await l.post("toDataURL", {
-						contentType: g,
-						quality: 1,
-						bitmap: e
-					}, [e]),
-					format: _,
-					contentType: g,
-					fileName: v
-				};
-				return c.fire("editor:object-exported", t), t;
-			}
-			let t = u.toCanvasElement({ enableRetinaScaling: !1 }), n = await new Promise((e, n) => {
-				t.toBlob((t) => {
-					t ? e(t) : n(/* @__PURE__ */ Error("Failed to create Blob from canvas"));
-				});
-			});
-			if (s) {
-				let e = {
-					object: u,
-					image: n,
-					format: _,
-					contentType: g,
-					fileName: v
-				};
-				return c.fire("editor:object-exported", e), e;
-			}
-			let r = {
-				object: u,
-				image: new File([n], v, { type: g }),
-				format: _,
-				contentType: g,
-				fileName: v
-			};
-			return c.fire("editor:object-exported", r), r;
+			return s.format === "svg" ? this._exportSvgObject({ request: s }) : e._canExportImageElementAsBase64({ request: s }) ? await this._exportImageElementAsBase64({ request: s }) : await this._exportRenderedObject({ request: s });
 		} catch (e) {
 			return this.editor.errorManager.emitError({
 				origin: "ImageManager",
@@ -3477,14 +3429,120 @@ var Ut = class {
 				code: "IMAGE_EXPORT_FAILED",
 				message: `Ошибка экспорта объекта: ${e.message}`,
 				data: {
-					contentType: g,
-					fileName: v,
-					exportAsBase64: o,
-					exportAsBlob: s
+					contentType: s.contentType,
+					fileName: s.fileName,
+					exportAsBase64: r,
+					exportAsBlob: i
 				}
 			}), null;
 		}
 	}
+	_createObjectExportRequest({ object: e, options: t }) {
+		let { fileName: n, contentType: r, exportAsBase64: i = !1, exportAsBlob: a = !1 } = t, { contentType: o, format: s = "" } = e || {}, c = r ?? o ?? "image/png", l = this.getFormatFromContentType(c) || s || "png";
+		return {
+			object: e,
+			contentType: c,
+			format: l,
+			fileName: n ?? `image.${l}`,
+			exportAsBase64: i,
+			exportAsBlob: a
+		};
+	}
+	static _hasExportObject({ request: e }) {
+		return !!e.object;
+	}
+	static _canExportImageElementAsBase64({ request: t }) {
+		return !t.exportAsBase64 || !(t.object instanceof a) ? !1 : !e._hasVisibleImageCrop({ image: t.object });
+	}
+	static _hasVisibleImageCrop({ image: t }) {
+		let n = Number(t.cropX ?? 0), r = Number(t.cropY ?? 0), i = Number(t.width ?? 0), a = Number(t.height ?? 0), o = e._getImageElementSize({ image: t });
+		return !!(n || r || o.width && i && i < o.width || o.height && a && a < o.height);
+	}
+	static _getImageElementSize({ image: e }) {
+		let t = e.getElement();
+		return {
+			width: t.naturalWidth || t.videoWidth || t.width || 0,
+			height: t.naturalHeight || t.videoHeight || t.height || 0
+		};
+	}
+	_exportSvgObject({ request: t }) {
+		let { canvas: n } = this.editor, r = t.object.toSVG(), i = e._exportSVGStringAsFile(r, {
+			exportAsBase64: t.exportAsBase64,
+			exportAsBlob: t.exportAsBlob,
+			fileName: t.fileName
+		}), a = {
+			object: t.object,
+			image: i,
+			format: t.format,
+			contentType: "image/svg+xml",
+			fileName: t.fileName.replace(/\.[^/.]+$/, ".svg")
+		};
+		return n.fire("editor:object-exported", a), a;
+	}
+	async _exportImageElementAsBase64({ request: e }) {
+		let { canvas: t, workerManager: n } = this.editor, r = await createImageBitmap(e.object.getElement()), i = await n.post("toDataURL", {
+			contentType: e.contentType,
+			quality: 1,
+			bitmap: r
+		}, [r]), a = {
+			object: e.object,
+			image: i,
+			format: e.format,
+			contentType: e.contentType,
+			fileName: e.fileName
+		};
+		return t.fire("editor:object-exported", a), a;
+	}
+	async _exportRenderedObject({ request: e }) {
+		let { canvas: t } = this.editor, n = await this._createObjectBlob({ request: e });
+		if (e.exportAsBlob) {
+			let r = {
+				object: e.object,
+				image: n,
+				format: e.format,
+				contentType: e.contentType,
+				fileName: e.fileName
+			};
+			return t.fire("editor:object-exported", r), r;
+		}
+		if (e.exportAsBase64) {
+			let r = await this._convertBlobToDataUrl({
+				blob: n,
+				contentType: e.contentType
+			}), i = {
+				object: e.object,
+				image: r,
+				format: e.format,
+				contentType: e.contentType,
+				fileName: e.fileName
+			};
+			return t.fire("editor:object-exported", i), i;
+		}
+		let r = new File([n], e.fileName, { type: e.contentType }), i = {
+			object: e.object,
+			image: r,
+			format: e.format,
+			contentType: e.contentType,
+			fileName: e.fileName
+		};
+		return t.fire("editor:object-exported", i), i;
+	}
+	async _createObjectBlob({ request: e }) {
+		let t = e.object.toCanvasElement({ enableRetinaScaling: !1 });
+		return new Promise((n, r) => {
+			t.toBlob((e) => {
+				e ? n(e) : r(/* @__PURE__ */ Error("Failed to create Blob from canvas"));
+			}, e.contentType, 1);
+		});
+	}
+	async _convertBlobToDataUrl({ blob: e, contentType: t }) {
+		let { workerManager: n } = this.editor, r = await createImageBitmap(e);
+		return n.post("toDataURL", {
+			contentType: t,
+			quality: 1,
+			bitmap: r
+		}, [r]);
+	}
 	revokeBlobUrls() {
 		this._createdBlobUrls.forEach(URL.revokeObjectURL), this._createdBlobUrls = [];
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anu3ev/fabric-image-editor",
-  "version": "0.9.24",
+  "version": "0.9.25",
   "description": "TypeScript image editor library built on FabricJS, allowing you to create instances with an integrated montage area and providing an API to modify and manage state.",
   "module": "dist/main.js",
   "files": [