@anu3ev/fabric-image-editor 0.6.14 → 0.6.15

package/dist/main.js

@@ -243,7 +243,7 @@ function N(e) {
 }
 //#endregion
 //#region src/editor/worker-manager/index.ts
-var P = class {
+var ee = class {
 	constructor(e) {
 		e ? this.worker = new Worker(e, { type: "module" }) : this.worker = new N(), this._callbacks = /* @__PURE__ */ new Map(), this.worker.onmessage = this._handleMessage.bind(this);
 	}
@@ -271,26 +271,26 @@ var P = class {
 	terminate() {
 		this.worker.terminate();
 	}
-}, F = "#2B2D33", ee = "#3D8BF4", I = "#FFFFFF";
+}, P = "#2B2D33", F = "#3D8BF4", I = "#FFFFFF";
 //#endregion
 //#region src/editor/customized-controls/renderers.ts
 function L(e, t, n, r, i) {
-	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = I, e.strokeStyle = ee, e.lineWidth = 1, e.beginPath(), e.roundRect(-12 / 2, -12 / 2, 12, 12, 2), e.fill(), e.stroke(), e.restore();
+	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = I, e.strokeStyle = F, e.lineWidth = 1, e.beginPath(), e.roundRect(-12 / 2, -12 / 2, 12, 12, 2), e.fill(), e.stroke(), e.restore();
 }
 function te(e, t, n, r, i) {
-	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = I, e.strokeStyle = ee, e.lineWidth = 1, e.beginPath(), e.roundRect(-8 / 2, -20 / 2, 8, 20, 100), e.fill(), e.stroke(), e.restore();
+	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = I, e.strokeStyle = F, e.lineWidth = 1, e.beginPath(), e.roundRect(-8 / 2, -20 / 2, 8, 20, 100), e.fill(), e.stroke(), e.restore();
 }
 function R(e, t, n, r, i) {
-	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = I, e.strokeStyle = ee, e.lineWidth = 1, e.beginPath(), e.roundRect(-20 / 2, -8 / 2, 20, 8, 100), e.fill(), e.stroke(), e.restore();
+	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = I, e.strokeStyle = F, e.lineWidth = 1, e.beginPath(), e.roundRect(-20 / 2, -8 / 2, 20, 8, 100), e.fill(), e.stroke(), e.restore();
 }
 var z = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgZmlsbD0ibm9uZSI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTE4Ljc1IDQuMzc1djMuNzVhLjYyNS42MjUgMCAwIDEtLjYyNS42MjVoLTMuNzVhLjYyNS42MjUgMCAwIDEgMC0xLjI1aDIuMTRsLTIuMDc3LTEuOTAzLS4wMi0uMDE5YTYuMjUgNi4yNSAwIDEgMC0uMTMgOC45NjcuNjI2LjYyNiAwIDAgMSAuODYuOTA5QTcuNDU2IDcuNDU2IDAgMCAxIDEwIDE3LjVoLS4xMDNhNy41IDcuNSAwIDEgMSA1LjM5Ni0xMi44MTJMMTcuNSA2LjcwM1Y0LjM3NWEuNjI1LjYyNSAwIDAgMSAxLjI1IDBaIi8+PC9zdmc+", ne = new Image();
 ne.src = z;
-function re(e, t, n, r, i) {
-	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = F, e.beginPath(), e.arc(0, 0, 16, 0, 2 * Math.PI), e.fill(), e.drawImage(ne, -16 / 2, -16 / 2, 16, 16), e.restore();
+function B(e, t, n, r, i) {
+	e.save(), e.translate(t, n), e.rotate(C.degreesToRadians(i.angle)), e.fillStyle = P, e.beginPath(), e.arc(0, 0, 16, 0, 2 * Math.PI), e.fill(), e.drawImage(ne, -16 / 2, -16 / 2, 16, 16), e.restore();
 }
 //#endregion
 //#region src/editor/customized-controls/default-controls.ts
-var ie = {
+var re = {
 	tl: {
 		render: L,
 		sizeX: 12,
@@ -348,13 +348,13 @@ var ie = {
 		offsetY: 0
 	},
 	mtr: {
-		render: re,
+		render: B,
 		sizeX: 32,
 		sizeY: 32,
 		offsetX: 0,
 		offsetY: -32
 	}
-}, B = class t {
+}, V = class t {
 	static wrapWidthControl(e) {
 		if (!(e != null && e.actionHandler)) return;
 		let t = e.actionHandler;
@@ -364,7 +364,7 @@ var ie = {
 		};
 	}
 	static applyControlOverrides(e) {
-		Object.entries(ie).forEach(([t, n]) => {
+		Object.entries(re).forEach(([t, n]) => {
 			let r = e[t];
 			r && (Object.assign(r, n), t === "mtr" && (r.cursorStyle = "grab", r.mouseDownHandler = (e, t, n, r) => {
 				var i;
@@ -457,7 +457,7 @@ var ie = {
 			mr: !0
 		});
 	}
-}, ae, oe = class e {
+}, ie, ae = class e {
 	constructor(e = []) {
 		this.fonts = e;
 	}
@@ -608,7 +608,7 @@ var ie = {
 		});
 	}
 };
-ae = oe, ae.registeredFontKeys = /* @__PURE__ */ new Set(), ae.descriptorDefaults = {
+ie = ae, ie.registeredFontKeys = /* @__PURE__ */ new Set(), ie.descriptorDefaults = {
 	style: "normal",
 	weight: "normal",
 	stretch: "normal",
@@ -619,7 +619,7 @@ ae = oe, ae.registeredFontKeys = /* @__PURE__ */ new Set(), ae.descriptorDefault
 };
 //#endregion
 //#region src/editor/ui/toolbar-manager/default-config.ts
-var se = {
+var oe = {
 	style: {
 		position: "absolute",
 		display: "none",
@@ -729,36 +729,36 @@ var se = {
 };
 //#endregion
 //#region \0@oxc-project+runtime@0.120.0/helpers/typeof.js
-function V(e) {
+function H(e) {
 	"@babel/helpers - typeof";
-	return V = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
+	return H = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
 		return typeof e;
 	} : function(e) {
 		return e && typeof Symbol == "function" && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
-	}, V(e);
+	}, H(e);
 }
 //#endregion
 //#region \0@oxc-project+runtime@0.120.0/helpers/toPrimitive.js
-function ce(e, t) {
-	if (V(e) != "object" || !e) return e;
+function se(e, t) {
+	if (H(e) != "object" || !e) return e;
 	var n = e[Symbol.toPrimitive];
 	if (n !== void 0) {
 		var r = n.call(e, t || "default");
-		if (V(r) != "object") return r;
+		if (H(r) != "object") return r;
 		throw TypeError("@@toPrimitive must return a primitive value.");
 	}
 	return (t === "string" ? String : Number)(e);
 }
 //#endregion
 //#region \0@oxc-project+runtime@0.120.0/helpers/toPropertyKey.js
-function le(e) {
-	var t = ce(e, "string");
-	return V(t) == "symbol" ? t : t + "";
+function ce(e) {
+	var t = se(e, "string");
+	return H(t) == "symbol" ? t : t + "";
 }
 //#endregion
 //#region \0@oxc-project+runtime@0.120.0/helpers/defineProperty.js
-function ue(e, t, n) {
-	return (t = le(t)) in e ? Object.defineProperty(e, t, {
+function le(e, t, n) {
+	return (t = ce(t)) in e ? Object.defineProperty(e, t, {
 		value: n,
 		enumerable: !0,
 		configurable: !0,
@@ -767,7 +767,7 @@ function ue(e, t, n) {
 }
 //#endregion
 //#region \0@oxc-project+runtime@0.120.0/helpers/objectSpread2.js
-function de(e, t) {
+function ue(e, t) {
 	var n = Object.keys(e);
 	if (Object.getOwnPropertySymbols) {
 		var r = Object.getOwnPropertySymbols(e);
@@ -777,12 +777,12 @@ function de(e, t) {
 	}
 	return n;
 }
-function H(e) {
+function U(e) {
 	for (var t = 1; t < arguments.length; t++) {
 		var n = arguments[t] == null ? {} : arguments[t];
-		t % 2 ? de(Object(n), !0).forEach(function(t) {
-			ue(e, t, n[t]);
-		}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : de(Object(n)).forEach(function(t) {
+		t % 2 ? ue(Object(n), !0).forEach(function(t) {
+			le(e, t, n[t]);
+		}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : ue(Object(n)).forEach(function(t) {
 			Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
 		});
 	}
@@ -790,18 +790,18 @@ function H(e) {
 }
 //#endregion
 //#region src/editor/ui/toolbar-manager/index.ts
-var U = class {
+var W = class {
 	constructor({ editor: e }) {
 		this.currentTarget = null, this.currentLocked = !1, this.isTransforming = !1, this.isTemporarilyHidden = !1, this.editor = e, this.canvas = e.canvas, this.options = e.options, this._initToolbar();
 	}
 	_initToolbar() {
 		if (!this.options.showToolbar) return;
 		let e = this.options.toolbar || {};
-		this.config = H(H(H({}, se), e), {}, {
-			style: H(H({}, se.style), e.style || {}),
-			btnStyle: H(H({}, se.btnStyle), e.btnStyle || {}),
-			icons: H(H({}, se.icons), e.icons || {}),
-			handlers: H(H({}, se.handlers), e.handlers || {})
+		this.config = U(U(U({}, oe), e), {}, {
+			style: U(U({}, oe.style), e.style || {}),
+			btnStyle: U(U({}, oe.btnStyle), e.btnStyle || {}),
+			icons: U(U({}, oe.icons), e.icons || {}),
+			handlers: U(U({}, oe.handlers), e.handlers || {})
 		}), this.currentTarget = null, this.currentLocked = !1, this.isTransforming = !1, this.isTemporarilyHidden = !1, this._onMouseDown = this._handleMouseDown.bind(this), this._onObjectMoving = this._startTransform.bind(this), this._onObjectScaling = this._startTransform.bind(this), this._onObjectRotating = this._startTransform.bind(this), this._onMouseUp = this._endTransform.bind(this), this._onObjectModified = this._endTransform.bind(this), this._onSelectionChange = this._updateToolbar.bind(this), this._onSelectionClear = () => {
 			this.el.style.display = "none";
 		}, this._createDOM(), this._bindEvents();
@@ -881,7 +881,7 @@ var U = class {
 	destroy() {
 		this.el.removeEventListener("mouseover", this._onBtnOver), this.el.removeEventListener("mouseout", this._onBtnOut), this.canvas.off("mouse:down", this._onMouseDown), this.canvas.off("object:moving", this._onObjectMoving), this.canvas.off("object:scaling", this._onObjectScaling), this.canvas.off("object:rotating", this._onObjectRotating), this.canvas.off("mouse:up", this._onMouseUp), this.canvas.off("object:modified", this._onObjectModified), this.canvas.off("selection:created", this._onSelectionChange), this.canvas.off("selection:updated", this._onSelectionChange), this.canvas.off("after:render", this._onSelectionChange), this.canvas.off("selection:cleared", this._onSelectionClear), this.el.remove();
 	}
-}, W = {
+}, de = {
 	position: "absolute",
 	display: "none",
 	background: "#2B2D33",
@@ -900,7 +900,7 @@ var U = class {
 		this.isActive = !1, this.currentAngle = 0, this.editor = e, this.canvas = e.canvas, this.options = e.options, this._createDOM(), this._bindEvents();
 	}
 	_createDOM() {
-		this.el = document.createElement("div"), this.el.className = fe, Object.entries(W).forEach(([e, t]) => {
+		this.el = document.createElement("div"), this.el.className = fe, Object.entries(de).forEach(([e, t]) => {
 			this.el.style.setProperty(e, t);
 		}), this.canvas.wrapperEl.appendChild(this.el);
 	}
@@ -946,7 +946,7 @@ var U = class {
 		var e;
 		this.canvas && (this.canvas.off("object:rotating", this._onObjectRotating), this.canvas.off("mouse:up", this._onMouseUp), this.canvas.off("object:modified", this._onObjectModified), this.canvas.off("selection:cleared", this._onSelectionCleared)), (e = this.el) != null && e.parentNode && this.el.parentNode.removeChild(this.el), this.el = null, this.editor = null, this.canvas = null, this.options = null;
 	}
-}, me = /* @__PURE__ */ "id.backgroundId.customData.backgroundType.format.contentType.width.height.locked.editable.evented.selectable.lockMovementX.lockMovementY.lockRotation.lockScalingX.lockScalingY.lockSkewingX.lockSkewingY.styles.lineFontDefaults.textCaseRaw.uppercase.autoExpand.linethrough.underline.fontStyle.fontWeight.backgroundOpacity.paddingTop.paddingRight.paddingBottom.paddingLeft.radiusTopLeft.radiusTopRight.radiusBottomRight.radiusBottomLeft.shapeComposite.shapePresetKey.shapeBaseWidth.shapeBaseHeight.shapeManualBaseWidth.shapeManualBaseHeight.shapeAlignHorizontal.shapeAlignVertical.shapePaddingTop.shapePaddingRight.shapePaddingBottom.shapePaddingLeft.shapeFill.shapeStroke.shapeStrokeWidth.shapeStrokeDashArray.shapeOpacity.shapeRounding.shapeNodeType".split(".");
+}, me = /* @__PURE__ */ "id.backgroundId.customData.backgroundType.format.contentType.width.height.locked.editable.evented.selectable.lockMovementX.lockMovementY.lockRotation.lockScalingX.lockScalingY.lockSkewingX.lockSkewingY.styles.lineFontDefaults.textCaseRaw.uppercase.autoExpand.linethrough.underline.fontStyle.fontWeight.backgroundOpacity.paddingTop.paddingRight.paddingBottom.paddingLeft.radiusTopLeft.radiusTopRight.radiusBottomRight.radiusBottomLeft.shapeComposite.shapePresetKey.shapeBaseWidth.shapeBaseHeight.shapeManualBaseWidth.shapeManualBaseHeight.shapeTextAutoExpand.shapeAlignHorizontal.shapeAlignVertical.shapePaddingTop.shapePaddingRight.shapePaddingBottom.shapePaddingLeft.shapeFill.shapeStroke.shapeStrokeWidth.shapeStrokeDashArray.shapeOpacity.shapeRounding.shapeNodeType".split(".");
 //#endregion
 //#region src/editor/history-manager/diff-normalization.ts
 function he({ state: e }) {
@@ -1438,7 +1438,7 @@ var Ue = class {
 			}
 		})();
 	}
-}, We = .1, Ge = 4096, Ke = 4096, qe = "application/image-editor:", Je = /* @__PURE__ */ "customData.backgroundType.format.contentType.width.height.locked.editable.evented.selectable.lockMovementX.lockMovementY.lockRotation.lockScalingX.lockScalingY.lockSkewingX.lockSkewingY.styles.lineFontDefaults.textCaseRaw.uppercase.autoExpand.linethrough.underline.fontStyle.fontWeight.backgroundOpacity.paddingTop.paddingRight.paddingBottom.paddingLeft.radiusTopLeft.radiusTopRight.radiusBottomRight.radiusBottomLeft.shapeComposite.shapePresetKey.shapeBaseWidth.shapeBaseHeight.shapeManualBaseWidth.shapeManualBaseHeight.shapeAlignHorizontal.shapeAlignVertical.shapePaddingTop.shapePaddingRight.shapePaddingBottom.shapePaddingLeft.shapeFill.shapeStroke.shapeStrokeWidth.shapeStrokeDashArray.shapeOpacity.shapeRounding.shapeNodeType".split("."), Ye = class e {
+}, We = .1, Ge = 4096, Ke = 4096, qe = "application/image-editor:", Je = /* @__PURE__ */ "customData.backgroundType.format.contentType.width.height.locked.editable.evented.selectable.lockMovementX.lockMovementY.lockRotation.lockScalingX.lockScalingY.lockSkewingX.lockSkewingY.styles.lineFontDefaults.textCaseRaw.uppercase.autoExpand.linethrough.underline.fontStyle.fontWeight.backgroundOpacity.paddingTop.paddingRight.paddingBottom.paddingLeft.radiusTopLeft.radiusTopRight.radiusBottomRight.radiusBottomLeft.shapeComposite.shapePresetKey.shapeBaseWidth.shapeBaseHeight.shapeManualBaseWidth.shapeManualBaseHeight.shapeTextAutoExpand.shapeAlignHorizontal.shapeAlignVertical.shapePaddingTop.shapePaddingRight.shapePaddingBottom.shapePaddingLeft.shapeFill.shapeStroke.shapeStrokeWidth.shapeStrokeDashArray.shapeOpacity.shapeRounding.shapeNodeType".split("."), Ye = class e {
 	constructor({ editor: e }) {
 		this.editor = e, this.options = e.options, this._createdBlobUrls = [], this.acceptContentTypes = this.editor.options.acceptContentTypes, this.acceptFormats = this.getAllowedFormatsFromContentTypes();
 	}
@@ -2531,7 +2531,7 @@ var pt = ({ canvas: e, options: t = {}, flags: n = {} }) => {
 	let { id: r = `rect-${D()}`, left: i, top: a, width: o = 100, height: s = 100, fill: c = "blue" } = t, l = ut(t, dt);
 	return ft({
 		canvas: e,
-		object: new g(H({
+		object: new g(U({
 			id: r,
 			left: i,
 			top: a,
@@ -3967,10 +3967,10 @@ function Qt() {
 //#region src/editor/shape-manager/shape-layout.ts
 var J = 1, $t = .5, en = 12, tn = 12, nn = .45, rn = 8, an = 8, on = ({ group: e, shape: t, text: n, width: r, height: i, alignH: a, alignV: o, padding: s }) => {
 	var c, l;
-	let u = fn({ padding: s }), d = Math.max(J, (c = e.shapeManualBaseWidth) == null ? r : c), f = Math.max(J, (l = e.shapeManualBaseHeight) == null ? i : l), p = sn({
+	let u = pn({ padding: s }), d = Math.max(J, (c = e.shapeManualBaseWidth) == null ? r : c), f = Math.max(J, (l = e.shapeManualBaseHeight) == null ? i : l), p = cn({
 		text: n,
 		padding: u
-	}), m = Math.max(J, r, p), h = ln({
+	}), m = Math.max(J, r, p), h = un({
 		text: n,
 		width: m,
 		height: i,
@@ -3983,7 +3983,7 @@ var J = 1, $t = .5, en = 12, tn = 12, nn = .45, rn = 8, an = 8, on = ({ group: e
 		rounding: e.shapeRounding,
 		strokeWidth: e.shapeStrokeWidth
 	});
-	let { frame: _, splitByGrapheme: v, textTop: y } = cn({
+	let { frame: _, splitByGrapheme: v, textTop: y } = ln({
 		text: n,
 		width: m,
 		height: g,
@@ -4012,22 +4012,56 @@ var J = 1, $t = .5, en = 12, tn = 12, nn = .45, rn = 8, an = 8, on = ({ group: e
 		scaleX: 1,
 		scaleY: 1
 	}), e.set("dirty", !0), e.setCoords();
-}, sn = ({ text: e, padding: t }) => {
-	if (!pn({ text: e })) return J;
-	let n = fn({ padding: t });
-	return un({
-		frameWidth: yn({ text: e }),
+}, sn = ({ text: e, currentWidth: t, minimumWidth: n, padding: r, strokeWidth: i, montageAreaWidth: a }) => {
+	let o = Math.max(J, t), s = Math.max(J, n);
+	if (!mn({ text: e })) return s;
+	let c = Number.isFinite(a) && a > 0 ? Math.max(J, a) : Math.max(o, s), l = Math.max(0, i == null ? 0 : i), u = Math.max(s, c);
+	if (l >= u) return Math.max(o, s);
+	let d = pn({ padding: r }), f = u, p = yn({
+		text: e,
+		frameWidth: _n({
+			width: f,
+			padding: d
+		})
+	});
+	if (p.hasWrappedLines) return f;
+	let m = Math.max(J, p.longestLineWidth), h = Math.min(f, Math.max(s, dn({
+		frameWidth: m,
+		padding: d
+	})));
+	for (let t = 0; t < rn; t += 1) {
+		let t = _n({
+			width: h,
+			padding: d
+		}), n = yn({
+			text: e,
+			frameWidth: t
+		}), r = t >= m - $t;
+		if (!n.hasWrappedLines && r) return h;
+		if (h >= f - $t) return f;
+		let i = n.hasWrappedLines ? Math.max(m + 1, t + 1) : m;
+		h = Math.min(f, Math.max(h + 1, dn({
+			frameWidth: i,
+			padding: d
+		})));
+	}
+	return h;
+}, cn = ({ text: e, padding: t }) => {
+	if (!mn({ text: e })) return J;
+	let n = pn({ padding: t });
+	return dn({
+		frameWidth: xn({ text: e }),
 		padding: n
 	});
-}, cn = ({ text: e, width: t, height: n, alignV: r, padding: i }) => {
-	let a = hn({
+}, ln = ({ text: e, width: t, height: n, alignV: r, padding: i }) => {
+	let a = gn({
 		width: Math.max(J, t),
 		height: Math.max(J, n),
-		padding: fn({ padding: i })
-	}), o = Cn({
+		padding: pn({ padding: i })
+	}), o = Tn({
 		text: e,
 		frameWidth: a.width
-	}), s = vn({
+	}), s = bn({
 		text: e,
 		frameWidth: a.width,
 		splitByGrapheme: o
@@ -4035,23 +4069,23 @@ var J = 1, $t = .5, en = 12, tn = 12, nn = .45, rn = 8, an = 8, on = ({ group: e
 	return {
 		frame: a,
 		splitByGrapheme: o,
-		textTop: xn({
+		textTop: Cn({
 			alignV: r,
 			frameHeight: a.height,
 			frameTop: a.top,
 			textHeight: s
 		})
 	};
-}, ln = ({ text: e, width: t, height: n, padding: r }) => {
+}, un = ({ text: e, width: t, height: n, padding: r }) => {
 	let i = Math.max(J, n);
-	if (!pn({ text: e })) return i;
-	let a = Math.max(J, t), o = fn({ padding: r }), s = i;
+	if (!mn({ text: e })) return i;
+	let a = Math.max(J, t), o = pn({ padding: r }), s = i;
 	for (let t = 0; t < an; t += 1) {
-		let t = hn({
+		let t = gn({
 			width: a,
 			height: s,
 			padding: o
-		}), n = vn({
+		}), n = bn({
 			text: e,
 			frameWidth: t.width
 		});
@@ -4061,10 +4095,10 @@ var J = 1, $t = .5, en = 12, tn = 12, nn = .45, rn = 8, an = 8, on = ({ group: e
 	}
 	return s;
 };
-function un({ frameWidth: e, padding: t }) {
+function dn({ frameWidth: e, padding: t }) {
 	let n = Math.max(J, e), r = n;
 	for (let e = 0; e < rn; e += 1) {
-		let e = gn({
+		let e = _n({
 			width: r,
 			padding: t
 		});
@@ -4074,38 +4108,38 @@ function un({ frameWidth: e, padding: t }) {
 	}
 	return r;
 }
-function dn({ left: e, top: t, canvasCenter: n }) {
+function fn({ left: e, top: t, canvasCenter: n }) {
 	return typeof e == "number" && typeof t == "number" ? new p(e, t) : n;
 }
-function fn({ padding: e }) {
+function pn({ padding: e }) {
 	return {
-		top: mn({ value: e.top }),
-		right: mn({ value: e.right }),
-		bottom: mn({ value: e.bottom }),
-		left: mn({ value: e.left })
+		top: hn({ value: e.top }),
+		right: hn({ value: e.right }),
+		bottom: hn({ value: e.bottom }),
+		left: hn({ value: e.left })
 	};
 }
-function pn({ text: e }) {
+function mn({ text: e }) {
 	var t;
 	return ((t = e.text) == null ? "" : t).trim().length > 0;
 }
-function mn({ value: e }) {
+function hn({ value: e }) {
 	return Math.min(Math.max(e, 0), nn);
 }
-function hn({ width: e, height: t, padding: n }) {
-	let r = Sn({
+function gn({ width: e, height: t, padding: n }) {
+	let r = wn({
 		size: e,
 		ratio: n.left,
 		axis: "horizontal"
-	}), i = Sn({
+	}), i = wn({
 		size: e,
 		ratio: n.right,
 		axis: "horizontal"
-	}), a = Sn({
+	}), a = wn({
 		size: t,
 		ratio: n.top,
 		axis: "vertical"
-	}), o = Sn({
+	}), o = wn({
 		size: t,
 		ratio: n.bottom,
 		axis: "vertical"
@@ -4117,19 +4151,19 @@ function hn({ width: e, height: t, padding: n }) {
 		height: Math.max(J, t - a - o)
 	};
 }
-function gn({ width: e, padding: t }) {
-	let n = Sn({
+function _n({ width: e, padding: t }) {
+	let n = wn({
 		size: e,
 		ratio: t.left,
 		axis: "horizontal"
-	}), r = Sn({
+	}), r = wn({
 		size: e,
 		ratio: t.right,
 		axis: "horizontal"
 	});
 	return Math.max(J, e - n - r);
 }
-function _n({ text: e }) {
+function vn({ text: e }) {
 	let { height: t } = e;
 	if (typeof t == "number" && Number.isFinite(t)) return t;
 	if (typeof e.calcTextHeight == "function") {
@@ -4138,8 +4172,27 @@ function _n({ text: e }) {
 	}
 	return J;
 }
-function vn({ text: e, frameWidth: t, splitByGrapheme: n }) {
-	let r = En({ text: e }), i = n == null ? Cn({
+function yn({ text: e, frameWidth: t }) {
+	let n = Dn({ text: e }), r = Tn({
+		text: e,
+		frameWidth: t
+	}), i = An({ text: e });
+	e.set({
+		autoExpand: !1,
+		width: Math.max(J, t),
+		splitByGrapheme: r
+	}), e.initDimensions();
+	let a = On({ text: e }) > n, o = Math.ceil(En({ text: e }));
+	return jn({
+		text: e,
+		state: i
+	}), {
+		hasWrappedLines: a,
+		longestLineWidth: o
+	};
+}
+function bn({ text: e, frameWidth: t, splitByGrapheme: n }) {
+	let r = An({ text: e }), i = n == null ? Tn({
 		text: e,
 		frameWidth: t
 	}) : n;
@@ -4148,68 +4201,77 @@ function vn({ text: e, frameWidth: t, splitByGrapheme: n }) {
 		width: Math.max(J, t),
 		splitByGrapheme: i
 	}), e.initDimensions();
-	let a = _n({ text: e });
-	return Dn({
+	let a = vn({ text: e });
+	return jn({
 		text: e,
 		state: r
 	}), a;
 }
-function yn({ text: e }) {
-	let t = bn({
+function xn({ text: e }) {
+	let t = Sn({
 		text: e,
 		frameWidth: J,
 		splitByGrapheme: !0
 	});
 	return Math.max(J, t);
 }
-function bn({ text: e, frameWidth: t, splitByGrapheme: n }) {
-	let r = En({ text: e });
+function Sn({ text: e, frameWidth: t, splitByGrapheme: n }) {
+	let r = An({ text: e });
 	e.set({
 		autoExpand: !1,
 		width: Math.max(J, t),
 		splitByGrapheme: n
 	}), e.initDimensions();
-	let i = wn({ text: e });
-	return Dn({
+	let i = En({ text: e });
+	return jn({
 		text: e,
 		state: r
 	}), i;
 }
-function xn({ alignV: e, frameHeight: t, frameTop: n, textHeight: r }) {
+function Cn({ alignV: e, frameHeight: t, frameTop: n, textHeight: r }) {
 	let i = Math.max(0, t - r);
 	return e === "top" ? n : e === "bottom" ? n + i : n + i / 2;
 }
-function Sn({ size: e, ratio: t, axis: n }) {
+function wn({ size: e, ratio: t, axis: n }) {
 	let r = n === "horizontal" ? en : tn, i = e * t;
 	return Math.max(0, Math.min(i, r));
 }
-function Cn({ text: e, frameWidth: t }) {
-	let n = Math.max(J, t), r = En({ text: e });
+function Tn({ text: e, frameWidth: t }) {
+	let n = Math.max(J, t), r = An({ text: e });
 	e.set({
 		autoExpand: !1,
 		width: n,
 		splitByGrapheme: !1
 	}), e.initDimensions();
-	let i = On({ text: e }) > n + $t;
-	return Dn({
+	let i = Mn({ text: e }) > n + $t;
+	return jn({
 		text: e,
 		state: r
 	}), i;
 }
-function wn({ text: e }) {
+function En({ text: e }) {
 	var t;
-	let n = e;
-	if (Array.isArray(n.textLines) && n.textLines.length > 0) return Tn({
+	let n = On({ text: e });
+	if (n > 0) return kn({
 		text: e,
-		lineCount: n.textLines.length
+		lineCount: n
 	});
-	let r = (t = n.text) == null ? "" : t;
-	return Tn({
+	let r = (t = e.text) == null ? "" : t;
+	return kn({
 		text: e,
 		lineCount: Math.max(r.split("\n").length, 1)
 	});
 }
-function Tn({ text: e, lineCount: t }) {
+function Dn({ text: e }) {
+	var t;
+	let n = (t = e.text) == null ? "" : t;
+	return Math.max(n.split("\n").length, 1);
+}
+function On({ text: e }) {
+	let t = e;
+	return Array.isArray(t.textLines) ? t.textLines.length : 0;
+}
+function kn({ text: e, lineCount: t }) {
 	let n = J;
 	for (let r = 0; r < t; r += 1) {
 		let t = e.getLineWidth(r);
@@ -4217,7 +4279,7 @@ function Tn({ text: e, lineCount: t }) {
 	}
 	return n;
 }
-function En({ text: e }) {
+function An({ text: e }) {
 	let { autoExpand: t, splitByGrapheme: n, width: r } = e;
 	return {
 		autoExpand: t,
@@ -4225,32 +4287,33 @@ function En({ text: e }) {
 		width: typeof r == "number" ? r : void 0
 	};
 }
-function Dn({ text: e, state: t }) {
+function jn({ text: e, state: t }) {
 	let { autoExpand: n, splitByGrapheme: r, width: i } = t, a = {};
 	n !== void 0 && (a.autoExpand = n), r !== void 0 && (a.splitByGrapheme = r), typeof i == "number" && (a.width = i), Object.keys(a).length > 0 && (e.set(a), e.initDimensions());
 }
-function On({ text: e }) {
+function Mn({ text: e }) {
 	let { dynamicMinWidth: t } = e;
 	return typeof t == "number" && Number.isFinite(t) ? t : 0;
 }
 //#endregion
 //#region src/editor/shape-manager/shape-runtime.ts
-var kn = ({ group: e }) => {
+var Nn = ({ group: e }) => {
 	let t = e;
 	typeof t.setInteractive == "function" && t.setInteractive(!0), t.set({
 		interactive: !0,
 		subTargetCheck: !0
 	});
-}, An = ({ text: e }) => {
+}, Pn = ({ text: e }) => {
 	e.set({
 		hasBorders: !1,
 		hasControls: !1,
 		evented: !1,
 		selectable: !1,
 		editable: !0,
+		autoExpand: !1,
 		shapeNodeType: "text"
 	}), e.setCoords();
-}, jn = ({ group: e }) => {
+}, Fn = ({ group: e }) => {
 	let { layoutManager: t } = e;
 	if (!t || typeof t.unsubscribeTargets != "function") return;
 	let n = e.getObjects();
@@ -4258,7 +4321,7 @@ var kn = ({ group: e }) => {
 		target: e,
 		targets: n
 	});
-}, Mn = ({ group: e }) => {
+}, In = ({ group: e }) => {
 	let t = e.getObjects();
 	for (let e = 0; e < t.length; e += 1) {
 		let n = t[e];
@@ -4269,23 +4332,23 @@ var kn = ({ group: e }) => {
 		if (n instanceof _) return n;
 	}
 	return null;
-}, Nn = [
+}, Ln = [
 	"tl",
 	"tr",
 	"bl",
 	"br"
-], Pn = ({ transform: e }) => {
+], Rn = ({ transform: e }) => {
 	let { originX: t, originY: n } = e;
 	return (t === "center" || t === .5) && (n === "center" || n === .5);
-}, Fn = ({ transform: e, x: t, y: n }) => {
+}, zn = ({ transform: e, x: t, y: n }) => {
 	let r = e, { target: i } = r, { scaleX: a = 1, scaleY: o = 1 } = i, s = b.getLocalPoint(r, r.originX, r.originY, t, n), c = Math.sign(s.x || r.signX || 1), l = Math.sign(s.y || r.signY || 1);
 	r.signX === void 0 && (r.signX = c), r.signY === void 0 && (r.signY = l);
 	let u = i._getTransformedDimensions(), d = Math.abs(s.x * a / u.x), f = Math.abs(s.y * o / u.y);
-	Pn({ transform: r }) && (d *= 2, f *= 2);
+	Rn({ transform: r }) && (d *= 2, f *= 2);
 	let p = !i.lockScalingX && (!i.lockScalingFlip || r.signX === c), m = !i.lockScalingY && (!i.lockScalingFlip || r.signY === l);
 	return p && i.set("scaleX", d), m && i.set("scaleY", f), a !== i.scaleX || o !== i.scaleY;
-}, In = () => {
-	let e = b.wrapWithFireEvent("scaling", b.wrapWithFixedAnchor((e, t, n, r) => Fn({
+}, Bn = () => {
+	let e = b.wrapWithFireEvent("scaling", b.wrapWithFixedAnchor((e, t, n, r) => zn({
 		transform: t,
 		x: n,
 		y: r
@@ -4301,38 +4364,38 @@ var kn = ({ group: e }) => {
 			a.uniformScaling = s;
 		}
 	};
-}, Ln = ({ control: e }) => {
-	let t = new r(H(H({}, e), {}, { actionHandler: In() }));
+}, Vn = ({ control: e }) => {
+	let t = new r(U(U({}, e), {}, { actionHandler: Bn() }));
 	return t.shapeFreeScaleCornerControl = !0, t;
-}, Rn = ({ group: e }) => {
-	let t = H({}, e.controls);
-	Nn.forEach((n) => {
+}, Hn = ({ group: e }) => {
+	let t = U({}, e.controls);
+	Ln.forEach((n) => {
 		let r = e.controls[n];
-		r && (r.shapeFreeScaleCornerControl || (t[n] = Ln({ control: r })));
+		r && (r.shapeFreeScaleCornerControl || (t[n] = Vn({ control: r })));
 	}), e.controls = t;
-}, zn = [
+}, Un = [
 	"layoutManager",
 	"objectCaching",
 	"centeredScaling",
 	"lockScalingFlip"
-], Bn = [
+], Wn = [
 	"type",
 	"objects",
 	"layoutManager"
-], Vn, Hn = "shape-group";
-function Un() {
+], Gn, Kn = "shape-group";
+function qn() {
 	return { performLayout() {} };
 }
-function Wn({ layoutManager: e }) {
+function Jn({ layoutManager: e }) {
 	let t = y.getClass("layoutManager");
 	if (!e) return new t();
 	let { strategy: n, type: r } = e, i = y.getClass(r);
 	return n ? new i(new (y.getClass(n))()) : new i();
 }
-var Gn = class e extends l {
+var Yn = class e extends l {
 	constructor(e = [], t = {}) {
-		let { layoutManager: n, objectCaching: r, centeredScaling: i, lockScalingFlip: a } = t, o = ut(t, zn);
-		super(e, H(H({}, o), {}, {
+		let { layoutManager: n, objectCaching: r, centeredScaling: i, lockScalingFlip: a } = t, o = ut(t, Un);
+		super(e, U(U({}, o), {}, {
 			layoutManager: n,
 			objectCaching: r == null ? !1 : r,
 			centeredScaling: i == null ? !1 : i,
@@ -4343,14 +4406,14 @@ var Gn = class e extends l {
 		this.set({
 			objectCaching: !1,
 			shapeComposite: !0
-		}), this._syncRoundability(), kn({ group: this }), Rn({ group: this });
-		let e = Mn({ group: this });
-		e && An({ text: e }), jn({ group: this }), this.setCoords();
+		}), this.shapeTextAutoExpand === void 0 && (this.shapeTextAutoExpand = !0), this._syncRoundability(), Nn({ group: this }), Hn({ group: this });
+		let e = In({ group: this });
+		e && Pn({ text: e }), Fn({ group: this }), this.setCoords();
 	}
 	static fromObject(t, n) {
 		return k(function* () {
-			let { type: r, objects: i = [], layoutManager: a } = t, o = ut(t, Bn), [s, c] = yield Promise.all([C.enlivenObjects(i, n), C.enlivenObjectEnlivables(o, n)]), l = new e(s, H(H(H({}, o), c), {}, { layoutManager: Un() }));
-			return l.layoutManager = Wn({ layoutManager: a }), l.layoutManager.subscribeTargets({
+			let { type: r, objects: i = [], layoutManager: a } = t, o = ut(t, Wn), [s, c] = yield Promise.all([C.enlivenObjects(i, n), C.enlivenObjectEnlivables(o, n)]), l = new e(s, U(U(U({}, o), c), {}, { layoutManager: qn() }));
+			return l.layoutManager = Jn({ layoutManager: a }), l.layoutManager.subscribeTargets({
 				type: "initialization",
 				target: l,
 				targets: l.getObjects()
@@ -4365,10 +4428,10 @@ var Gn = class e extends l {
 		t && (this.shapeCanRound = At({ preset: t }));
 	}
 };
-Vn = Gn, Vn.type = Hn;
-var Kn = () => {
-	y != null && y.setClass && y.setClass(Gn, Hn);
-}, Y = (e) => e instanceof Gn || e instanceof l && e.shapeComposite === !0, qn = ({ target: e, subTargets: t = [] }) => {
+Gn = Yn, Gn.type = Kn;
+var Xn = () => {
+	y != null && y.setClass && y.setClass(Yn, Kn);
+}, Y = (e) => e instanceof Yn || e instanceof l && e.shapeComposite === !0, Zn = ({ target: e, subTargets: t = [] }) => {
 	if (Y(e)) return e;
 	if (e != null && e.group && Y(e.group)) return e.group;
 	for (let e = 0; e < t.length; e += 1) {
@@ -4378,7 +4441,7 @@ var Kn = () => {
 		if (r && Y(r)) return r;
 	}
 	return null;
-}, Jn = ({ group: e }) => {
+}, Qn = ({ group: e }) => {
 	let t = e.getObjects();
 	for (let e = 0; e < t.length; e += 1) {
 		let n = t[e];
@@ -4389,7 +4452,7 @@ var Kn = () => {
 		if (!(n instanceof _)) return n;
 	}
 	return null;
-}, Yn = ({ group: e }) => {
+}, $n = ({ group: e }) => {
 	let t = e.getObjects();
 	for (let e = 0; e < t.length; e += 1) {
 		let n = t[e];
@@ -4400,17 +4463,17 @@ var Kn = () => {
 		if (n instanceof _) return n;
 	}
 	return null;
-}, Xn = ({ group: e }) => ({
-	shape: Jn({ group: e }),
-	text: Yn({ group: e })
-}), Zn = ({ group: e }) => {
-	kn({ group: e });
-}, Qn = ({ transform: e, key: t }) => {
+}, er = ({ group: e }) => ({
+	shape: Qn({ group: e }),
+	text: $n({ group: e })
+}), tr = ({ group: e }) => {
+	Nn({ group: e });
+}, nr = ({ transform: e, key: t }) => {
 	let n = e == null ? void 0 : e.original;
 	if (!n || typeof n != "object") return null;
 	let r = n[t];
 	return typeof r != "number" || !Number.isFinite(r) ? null : r;
-}, $n = ({ value: e }) => e === "left" || e === "center" || e === "right" || typeof e == "number" && Number.isFinite(e) ? e : null, er = ({ value: e }) => e === "top" || e === "center" || e === "bottom" || typeof e == "number" && Number.isFinite(e) ? e : null, tr = ({ transform: e }) => {
+}, rr = ({ value: e }) => e === "left" || e === "center" || e === "right" || typeof e == "number" && Number.isFinite(e) ? e : null, ir = ({ value: e }) => e === "top" || e === "center" || e === "bottom" || typeof e == "number" && Number.isFinite(e) ? e : null, ar = ({ transform: e }) => {
 	var t;
 	let n = (t = e == null ? void 0 : e.action) == null ? "" : t, r = typeof (e == null ? void 0 : e.corner) == "string" ? e.corner : "", i = r === "tl" || r === "tr" || r === "bl" || r === "br", a = n === "scaleX" || r === "ml" || r === "mr", o = n === "scaleY" || r === "mt" || r === "mb", s = a || i, c = o || i;
 	return {
@@ -4419,39 +4482,39 @@ var Kn = () => {
 		isCornerScaleAction: i,
 		isVerticalOnlyScale: c && !s
 	};
-}, nr = ({ event: e, group: t, transform: n, canvas: r }) => {
+}, or = ({ event: e, group: t, transform: n, canvas: r }) => {
 	var i, a, o, s, c;
 	if (!e) return null;
 	let l = (i = t.canvas) == null ? r : i, u = l.getScenePoint(e), d = t.getRelativeCenterPoint(), f = t.translateToGivenOrigin(d, "center", "center", n.originX, n.originY), p = (a = t.angle) == null ? 0 : a, m = (p === 0 ? u : u.rotate(-p * Math.PI / 180, d)).subtract(f), h = t.controls[n.corner], g = l.getZoom() || 1, _ = ((o = t.padding) == null ? 0 : o) / g;
 	return m.x >= _ && (m.x -= _), m.x <= -_ && (m.x += _), m.y >= _ && (m.y -= _), m.y <= -_ && (m.y += _), m.x -= (s = h == null ? void 0 : h.offsetX) == null ? 0 : s, m.y -= (c = h == null ? void 0 : h.offsetY) == null ? 0 : c, m;
-}, rr = ({ group: e, originX: t, originY: n }) => {
+}, sr = ({ group: e, originX: t, originY: n }) => {
 	if (t === null || n === null) return null;
 	let r = e, i = typeof r.getRelativeCenterPoint == "function" ? r.getRelativeCenterPoint() : e.getCenterPoint();
 	return typeof r.translateToOriginPoint == "function" ? r.translateToOriginPoint(i, t, n) : i;
-}, ir = ({ state: e, transform: t }) => {
+}, cr = ({ state: e, transform: t }) => {
 	if (!t || e.startTransformOriginX === null && e.startTransformOriginY === null) return !1;
-	let n = $n({ value: t.originX }), r = er({ value: t.originY });
+	let n = rr({ value: t.originX }), r = ir({ value: t.originY });
 	return n !== e.startTransformOriginX || r !== e.startTransformOriginY;
-}, ar = ({ state: e, transform: t }) => !t || !e.startTransformCorner ? !1 : t.corner !== e.startTransformCorner;
+}, lr = ({ state: e, transform: t }) => !t || !e.startTransformCorner ? !1 : t.corner !== e.startTransformCorner;
 //#endregion
 //#region src/editor/shape-manager/scaling/shape-scaling-preview.ts
-function or({ size: e, scale: t, strokeWidth: n, minSize: r, scaleEpsilon: i }) {
+function ur({ size: e, scale: t, strokeWidth: n, minSize: r, scaleEpsilon: i }) {
 	let a = Math.max(i, Math.abs(t) || 1), o = Math.max(0, n);
 	return o <= 0 ? Math.max(r, e / a) : Math.max(r, e / a + o - o / a);
 }
-function sr({ group: e, shape: t, width: n, height: r, scaleX: i, scaleY: a, minSize: o, scaleEpsilon: s }) {
+function dr({ group: e, shape: t, width: n, height: r, scaleX: i, scaleY: a, minSize: o, scaleEpsilon: s }) {
 	var c;
 	let l = Math.max(0, (c = e.shapeStrokeWidth) == null ? 0 : c);
 	Pt({
 		shape: t,
-		width: or({
+		width: ur({
 			size: n,
 			scale: i,
 			strokeWidth: l,
 			minSize: o,
 			scaleEpsilon: s
 		}),
-		height: or({
+		height: ur({
 			size: r,
 			scale: a,
 			strokeWidth: l,
@@ -4462,8 +4525,8 @@ function sr({ group: e, shape: t, width: n, height: r, scaleX: i, scaleY: a, min
 		strokeWidth: l
 	});
 }
-function cr({ text: e, width: t, height: n, padding: r, alignH: i, alignV: a, scaleX: o, scaleY: s, scaleEpsilon: c }) {
-	let l = Math.max(c, Math.abs(o) || 1), u = Math.max(c, Math.abs(s) || 1), d = i == null ? Ct : i, { frame: f, splitByGrapheme: p, textTop: m } = cn({
+function fr({ text: e, width: t, height: n, padding: r, alignH: i, alignV: a, scaleX: o, scaleY: s, scaleEpsilon: c }) {
+	let l = Math.max(c, Math.abs(o) || 1), u = Math.max(c, Math.abs(s) || 1), d = i == null ? Ct : i, { frame: f, splitByGrapheme: p, textTop: m } = ln({
 		text: e,
 		width: t,
 		height: n,
@@ -4483,13 +4546,13 @@ function cr({ text: e, width: t, height: n, padding: r, alignH: i, alignV: a, sc
 		scaleY: 1 / u
 	}), e.initDimensions(), e.setCoords();
 }
-var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH: o, alignV: s, scaleX: c, scaleY: l, minSize: u, scaleEpsilon: d }) => {
+var pr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH: o, alignV: s, scaleX: c, scaleY: l, minSize: u, scaleEpsilon: d }) => {
 	let f = Math.max(d, Math.abs(c) || 1), p = Math.max(d, Math.abs(l) || 1);
 	e.set({
 		width: r / f,
 		height: i / p,
 		dirty: !0
-	}), sr({
+	}), dr({
 		group: e,
 		shape: t,
 		width: r,
@@ -4498,7 +4561,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		scaleY: l,
 		minSize: u,
 		scaleEpsilon: d
-	}), cr({
+	}), fr({
 		text: n,
 		width: r,
 		height: i,
@@ -4509,13 +4572,13 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		scaleY: l,
 		scaleEpsilon: d
 	});
-}, X = 1, Z = 1e-4, ur = .5, dr = class e {
+}, X = 1, Z = 1e-4, mr = .5, hr = class e {
 	constructor({ canvas: t }) {
 		this.handleObjectScaling = (t) => {
 			var n, r, i, a, o, s;
 			let { target: c, transform: l } = t;
 			if (!Y(c)) return;
-			let u = c, { shape: d, text: f } = Xn({ group: u });
+			let u = c, { shape: d, text: f } = er({ group: u });
 			if (!d || !f) return;
 			u.set({
 				lockScalingFlip: !0,
@@ -4526,7 +4589,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 				text: f,
 				padding: p,
 				transform: l
-			}), { isCornerScaleAction: h } = tr({ transform: l }), g = !!(t.e && "shiftKey" in t.e && t.e.shiftKey);
+			}), { isCornerScaleAction: h } = ar({ transform: l }), g = !!(t.e && "shiftKey" in t.e && t.e.shiftKey);
 			m.isProportionalScaling = h && g;
 			let _ = (n = u.left) == null ? 0 : n, v = (r = u.top) == null ? 0 : r, y = !!u.flipX, b = !!u.flipY, x = (i = u.shapeAlignHorizontal) == null ? Ct : i, S = (a = u.shapeAlignVertical) == null ? wt : a, C = this._resolveScalingDecision({
 				group: u,
@@ -4541,7 +4604,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 				shouldHandleAsNoop: C.shouldHandleAsNoop,
 				scaleX: C.appliedScaleX,
 				scaleY: C.appliedScaleY
-			}), lr({
+			}), pr({
 				group: u,
 				shape: d,
 				text: f,
@@ -4577,22 +4640,22 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			if (!c) return;
 			let { target: l } = c;
 			if (!Y(l)) return;
-			let { canScaleHeight: u, canScaleWidth: d } = tr({ transform: c });
+			let { canScaleHeight: u, canScaleWidth: d } = ar({ transform: c });
 			if (!d && !u) return;
 			let f = l, p = this.scalingState.get(f);
 			if (!p || p.isProportionalScaling) return;
-			let { shape: m, text: h } = Xn({ group: f });
+			let { shape: m, text: h } = er({ group: f });
 			if (!m || !h) return;
-			let g = e._resolvePadding({ group: f }), _ = (n = f.shapeAlignHorizontal) == null ? Ct : n, v = (r = f.shapeAlignVertical) == null ? wt : r, y = Math.abs((i = (a = f.scaleX) == null ? p.lastAllowedScaleX : a) == null ? 1 : i) || 1, b = Math.abs((o = (s = f.scaleY) == null ? p.lastAllowedScaleY : s) == null ? 1 : o) || 1, x = H(H({}, t), {}, { transform: c }), S = y, C = b, w = null, T = !1, E = !1;
+			let g = e._resolvePadding({ group: f }), _ = (n = f.shapeAlignHorizontal) == null ? Ct : n, v = (r = f.shapeAlignVertical) == null ? wt : r, y = Math.abs((i = (a = f.scaleX) == null ? p.lastAllowedScaleX : a) == null ? 1 : i) || 1, b = Math.abs((o = (s = f.scaleY) == null ? p.lastAllowedScaleY : s) == null ? 1 : o) || 1, x = U(U({}, t), {}, { transform: c }), S = y, C = b, w = null, T = !1, E = !1;
 			if (d && this._hasPointerReachedScaleOrigin({
 				event: x,
 				group: f,
 				axis: "x"
 			})) {
-				let e = sn({
+				let e = cn({
 					text: h,
 					padding: g
-				}), t = Math.max(X / p.baseWidth, e / p.baseWidth);
+				}), t = Math.max(X / p.startWidth, e / p.startWidth);
 				p.lastAllowedScaleX > t + Z && (S = t, T = !0, E = !0);
 			}
 			if (u && this._hasPointerReachedScaleOrigin({
@@ -4602,10 +4665,10 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			})) {
 				w = this._resolveMinimumTextFitHeight({
 					text: h,
-					width: Math.max(X, p.baseWidth * S),
+					width: Math.max(X, p.startWidth * S),
 					padding: g
 				});
-				let e = Math.max(X / p.baseHeight, w / p.baseHeight);
+				let e = Math.max(X / p.startHeight, w / p.startHeight);
 				p.lastAllowedScaleY > e + Z && (C = e, E = !0);
 			}
 			if (!E) return;
@@ -4623,7 +4686,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 				shouldHandleAsNoop: !1,
 				scaleX: S,
 				scaleY: C
-			}), lr({
+			}), pr({
 				group: f,
 				shape: m,
 				text: h,
@@ -4650,97 +4713,106 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 				currentFlipY: p.lastAllowedFlipY
 			}), this.canvas.requestRenderAll();
 		}, this.handleObjectModified = (t) => {
-			var n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _;
-			let { target: v } = t;
-			if (!Y(v)) return;
-			let y = v, b = this.scalingState.get(y), x = Math.abs((n = y.scaleX) == null ? 1 : n) || 1, S = Math.abs((r = y.scaleY) == null ? 1 : r) || 1;
-			if (!(Math.abs(x - 1) > Z || Math.abs(S - 1) > Z) && !b) return;
-			let C = (i = b == null ? void 0 : b.baseWidth) == null ? Math.max(X, (a = (o = (s = y.shapeManualBaseWidth) == null ? y.shapeBaseWidth : s) == null ? y.width : o) == null ? X : a) : i, w = (c = b == null ? void 0 : b.baseHeight) == null ? Math.max(X, (l = (u = (d = y.shapeManualBaseHeight) == null ? y.shapeBaseHeight : d) == null ? y.height : u) == null ? X : l) : c;
-			if (b != null && b.blockedScaleAttempt && b) {
-				let { shape: e, text: t } = Xn({ group: y });
+			var n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _, v, y, b, x, S, C, w, T;
+			let { target: E } = t;
+			if (!Y(E)) return;
+			let D = E, O = this.scalingState.get(D), k = Math.abs((n = D.scaleX) == null ? 1 : n) || 1, A = Math.abs((r = D.scaleY) == null ? 1 : r) || 1;
+			if (!(Math.abs(k - 1) > Z || Math.abs(A - 1) > Z) && !O) return;
+			let j = (i = O == null ? void 0 : O.startWidth) == null ? Math.max(X, (a = (o = (s = D.shapeBaseWidth) == null ? D.width : s) == null ? D.shapeManualBaseWidth : o) == null ? X : a) : i, M = (c = O == null ? void 0 : O.startHeight) == null ? Math.max(X, (l = (u = (d = D.shapeBaseHeight) == null ? D.height : d) == null ? D.shapeManualBaseHeight : u) == null ? X : l) : c, N = (f = O == null ? void 0 : O.startManualBaseWidth) == null ? Math.max(X, (p = D.shapeManualBaseWidth) == null ? j : p) : f, ee = (m = O == null ? void 0 : O.startManualBaseHeight) == null ? Math.max(X, (h = D.shapeManualBaseHeight) == null ? M : h) : m;
+			if (O != null && O.blockedScaleAttempt && O) {
+				let { shape: e, text: t } = er({ group: D });
 				this._restoreGroupTransformOnly({
-					group: y,
+					group: D,
 					shape: e,
 					text: t,
-					state: b
-				}), y.shapeScalingNoopTransform = !1, this.scalingState.delete(y), this.canvas.requestRenderAll();
+					state: O
+				}), D.shapeScalingNoopTransform = !1, this.scalingState.delete(D), this.canvas.requestRenderAll();
 				return;
 			}
-			let { shape: T, text: E } = Xn({ group: y });
-			if (!T || !E) {
-				this.scalingState.delete(y);
+			let { shape: P, text: F } = er({ group: D });
+			if (!P || !F) {
+				this.scalingState.delete(D);
 				return;
 			}
-			let D = (f = y.shapeAlignHorizontal) == null ? Ct : f, O = (p = y.shapeAlignVertical) == null ? wt : p, k = e._resolvePadding({ group: y }), A = sn({
-				text: E,
-				padding: k
-			}), j = (m = b == null ? void 0 : b.lastAllowedScaleX) == null ? x : m, M = (h = b == null ? void 0 : b.lastAllowedScaleY) == null ? S : h;
-			if (!(b != null && b.isProportionalScaling)) {
+			let I = (g = D.shapeAlignHorizontal) == null ? Ct : g, L = (_ = D.shapeAlignVertical) == null ? wt : _, te = e._resolvePadding({ group: D }), R = t.transform ? ar({ transform: t.transform }) : null, z = (v = (y = O == null ? void 0 : O.canScaleWidth) == null ? R == null ? void 0 : R.canScaleWidth : y) == null ? Math.abs(k - 1) > Z : v, ne = (b = (x = O == null ? void 0 : O.canScaleHeight) == null ? R == null ? void 0 : R.canScaleHeight : x) == null ? Math.abs(A - 1) > Z : b, B = cn({
+				text: F,
+				padding: te
+			}), re = (S = O == null ? void 0 : O.lastAllowedScaleX) == null ? k : S, V = (C = O == null ? void 0 : O.lastAllowedScaleY) == null ? A : C;
+			if (!(O != null && O.isProportionalScaling)) {
 				this._shouldClampWidthToMinimum({
 					event: t,
-					group: y,
-					minimumWidth: A,
-					state: b
-				}) && (j = Math.max(X / C, A / C));
+					group: D,
+					minimumWidth: B,
+					state: O
+				}) && (re = Math.max(X / j, B / j));
 				let e = this._resolveMinimumTextFitHeight({
-					text: E,
-					width: Math.max(X, C * j),
-					padding: k
+					text: F,
+					width: Math.max(X, j * re),
+					padding: te
 				});
 				this._shouldClampHeightToMinimum({
 					event: t,
-					group: y,
+					group: D,
 					minimumHeight: e,
-					state: b
-				}) && (M = Math.max(X / w, e / w));
+					state: O
+				}) && (V = Math.max(X / M, e / M));
 			}
-			let N = Math.max(X, C * j), P = Math.max(X, w * M), F = Math.abs(N - C) > ur, ee = Math.abs(P - w) > ur, I = F || ee, L = N, te = P;
-			if (!I && b) {
+			let ie = z ? Math.max(X, j * re) : j, ae = ne ? Math.max(X, M * V) : ee, oe = Math.abs(ie - j) > mr, H = Math.abs(ae - M) > mr, se = oe || H, ce = ie, le = ae;
+			if (!se && O) {
 				this._restoreShapeStateWithoutResize({
-					group: y,
-					shape: T,
-					text: E,
-					state: b,
-					baseWidth: C,
-					baseHeight: w,
-					alignH: D,
-					alignV: O,
-					padding: k
-				}), this.scalingState.delete(y), this.canvas.requestRenderAll();
+					group: D,
+					shape: P,
+					text: F,
+					state: O,
+					startWidth: j,
+					startHeight: M,
+					alignH: I,
+					alignV: L,
+					padding: te
+				}), this.scalingState.delete(D), this.canvas.requestRenderAll();
 				return;
 			}
-			b && y.set({
-				left: b.lastAllowedLeft,
-				top: b.lastAllowedTop
-			}), y.shapeManualBaseWidth = L, y.shapeManualBaseHeight = te;
-			let R = (g = b == null ? void 0 : b.baseRounding) == null ? Math.max(0, (_ = y.shapeRounding) == null ? 0 : _) : g;
-			y.shapeRounding = Math.max(0, R * Math.min(j, M)), on({
-				group: y,
-				shape: T,
-				text: E,
-				width: L,
-				height: te,
-				alignH: D,
-				alignV: O,
-				padding: k
-			}), E.set({
+			O && D.set({
+				left: O.lastAllowedLeft,
+				top: O.lastAllowedTop
+			});
+			let ue = this._resolveNextManualBaseDimensionsAfterScaling({
+				startManualBaseWidth: N,
+				startManualBaseHeight: ee,
+				canScaleWidth: z,
+				canScaleHeight: ne,
+				finalWidth: ce,
+				finalHeight: le
+			});
+			D.shapeManualBaseWidth = ue.width, D.shapeManualBaseHeight = ue.height;
+			let U = (w = O == null ? void 0 : O.baseRounding) == null ? Math.max(0, (T = D.shapeRounding) == null ? 0 : T) : w;
+			D.shapeRounding = Math.max(0, U * Math.min(re, V)), on({
+				group: D,
+				shape: P,
+				text: F,
+				width: ce,
+				height: le,
+				alignH: I,
+				alignV: L,
+				padding: te
+			}), F.set({
 				scaleX: 1,
 				scaleY: 1
-			}), y.set({
+			}), D.set({
 				scaleX: 1,
 				scaleY: 1
-			}), b && this._restoreScalingAnchorPosition({
-				group: y,
-				state: b
-			}), y.setCoords(), E.setCoords(), T.setCoords(), this.scalingState.delete(y), y.shapeScalingNoopTransform = !1, this.canvas.requestRenderAll();
+			}), O && this._restoreScalingAnchorPosition({
+				group: D,
+				state: O
+			}), D.setCoords(), F.setCoords(), P.setCoords(), this.scalingState.delete(D), D.shapeScalingNoopTransform = !1, this.canvas.requestRenderAll();
 		}, this.canvas = t, this.scalingState = /* @__PURE__ */ new WeakMap();
 	}
 	_resolveScalingDecision({ group: e, text: t, padding: n, state: r, transform: i }) {
 		var a, o, s, c, l, u;
-		let d = (a = e.scaleX) == null ? 1 : a, f = (o = e.scaleY) == null ? 1 : o, p = Math.abs(d) || 1, m = Math.abs(f) || 1, h = d < 0 || f < 0, g = ir({
+		let d = (a = e.scaleX) == null ? 1 : a, f = (o = e.scaleY) == null ? 1 : o, p = Math.abs(d) || 1, m = Math.abs(f) || 1, h = d < 0 || f < 0, g = cr({
 			state: r,
 			transform: i
-		}), _ = ar({
+		}), _ = lr({
 			state: r,
 			transform: i
 		});
@@ -4772,7 +4844,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		};
 	}
 	_resolveScalingConstraintState({ text: e, padding: t, state: n, transform: r, scaleX: i, scaleY: a }) {
-		let { baseHeight: o, baseWidth: s, cannotScaleDownAtStart: c, crossedOppositeCorner: l, isProportionalScaling: u, lastAllowedScaleX: d, lastAllowedScaleY: f, startScaleY: p } = n, m = Math.max(X, s * i), h = Math.max(X, o * a), g = i < d - Z, _ = a < f - Z, v = a < p - Z, { canScaleHeight: y, canScaleWidth: b, isVerticalOnlyScale: x } = tr({ transform: r }), S = b && g ? sn({
+		let { startHeight: o, startWidth: s, cannotScaleDownAtStart: c, crossedOppositeCorner: l, isProportionalScaling: u, lastAllowedScaleX: d, lastAllowedScaleY: f, startScaleY: p } = n, m = Math.max(X, s * i), h = Math.max(X, o * a), g = i < d - Z, _ = a < f - Z, v = a < p - Z, { canScaleHeight: y, canScaleWidth: b, isVerticalOnlyScale: x } = ar({ transform: r }), S = b && g ? cn({
 			text: e,
 			padding: t
 		}) : null, C = y && _ ? this._resolveMinimumTextFitHeight({
@@ -4791,7 +4863,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		};
 	}
 	_resolvePreviewDimensions({ text: e, padding: t, state: n, appliedScaleX: r, appliedScaleY: i, minimumHeight: a }) {
-		let o = Math.max(X, n.baseWidth * r), s = Math.max(X, n.baseHeight * i), c = a == null ? ln({
+		let o = n.canScaleWidth ? Math.max(X, n.startWidth * r) : n.startWidth, s = n.canScaleHeight ? Math.max(X, n.startHeight * i) : n.startManualBaseHeight, c = a == null ? un({
 			text: e,
 			width: o,
 			height: s,
@@ -4825,26 +4897,26 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		if (!r) return !1;
 		let { transform: i } = e;
 		if (!i) return !1;
-		let { canScaleWidth: a } = tr({ transform: i });
+		let { canScaleWidth: a } = ar({ transform: i });
 		if (!a || !this._hasPointerReachedScaleOrigin({
 			event: e,
 			group: t,
 			axis: "x"
 		})) return !1;
-		let o = Math.max(X / r.baseWidth, n / r.baseWidth);
+		let o = Math.max(X / r.startWidth, n / r.startWidth);
 		return r.lastAllowedScaleX > o + Z;
 	}
 	_shouldClampHeightToMinimum({ event: e, group: t, minimumHeight: n, state: r }) {
 		if (!r) return !1;
 		let { transform: i } = e;
 		if (!i) return !1;
-		let { canScaleHeight: a } = tr({ transform: i });
+		let { canScaleHeight: a } = ar({ transform: i });
 		if (!a || !this._hasPointerReachedScaleOrigin({
 			event: e,
 			group: t,
 			axis: "y"
 		})) return !1;
-		let o = Math.max(X / r.baseHeight, n / r.baseHeight);
+		let o = Math.max(X / r.startHeight, n / r.startHeight);
 		return r.lastAllowedScaleY > o + Z;
 	}
 	_hasPointerReachedScaleOrigin({ event: e, group: t, axis: n }) {
@@ -4852,7 +4924,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		if (!r) return !1;
 		let i = r, a = n === "x" ? i.signX : i.signY;
 		if (typeof a != "number" || !Number.isFinite(a)) return !1;
-		let o = nr({
+		let o = or({
 			event: e.e,
 			group: t,
 			transform: r,
@@ -4866,59 +4938,66 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	_ensureScalingState({ group: e, text: t, padding: n, transform: r }) {
 		let i = this.scalingState.get(e);
 		if (!i) {
-			var a, o, s, c, l, u, d, f, p, m, h, g, _, v, y, b, x;
-			let S = Math.max(X, (a = (o = (s = e.shapeManualBaseWidth) == null ? e.shapeBaseWidth : s) == null ? e.width : o) == null ? X : a), C = Math.max(X, (c = (l = (u = e.shapeManualBaseHeight) == null ? e.shapeBaseHeight : u) == null ? e.height : l) == null ? X : c), w = Qn({
+			var a, o, s, c, l, u, d, f, p, m, h;
+			let g = this._resolveScalingStartDimensions({
+				group: e,
+				transform: r
+			}), _ = nr({
 				transform: r,
 				key: "scaleX"
-			}), T = Qn({
+			}), v = nr({
 				transform: r,
 				key: "scaleY"
-			}), E = Qn({
+			}), y = nr({
 				transform: r,
 				key: "left"
-			}), D = Qn({
+			}), b = nr({
 				transform: r,
 				key: "top"
-			}), O = Math.abs((d = w == null ? e.scaleX : w) == null ? 1 : d) || 1, k = Math.abs((f = T == null ? e.scaleY : T) == null ? 1 : f) || 1, A = (p = E == null ? e.left : E) == null ? 0 : p, j = (m = D == null ? e.top : D) == null ? 0 : m, M = $n({ value: (h = r == null || (g = r.original) == null ? void 0 : g.originX) == null ? r == null ? void 0 : r.originX : h }), N = er({ value: (_ = r == null || (v = r.original) == null ? void 0 : v.originY) == null ? r == null ? void 0 : r.originY : _ }), P = typeof (r == null ? void 0 : r.corner) == "string" ? r.corner : null, F = rr({
+			}), x = Math.abs((a = _ == null ? e.scaleX : _) == null ? 1 : a) || 1, S = Math.abs((o = v == null ? e.scaleY : v) == null ? 1 : o) || 1, C = (s = y == null ? e.left : y) == null ? 0 : s, w = (c = b == null ? e.top : b) == null ? 0 : c, T = rr({ value: (l = r == null || (u = r.original) == null ? void 0 : u.originX) == null ? r == null ? void 0 : r.originX : l }), E = ir({ value: (d = r == null || (f = r.original) == null ? void 0 : f.originY) == null ? r == null ? void 0 : r.originY : d }), D = typeof (r == null ? void 0 : r.corner) == "string" ? r.corner : null, O = sr({
 				group: e,
-				originX: M,
-				originY: N
-			}), ee = this._resolveMinimumTextFitHeight({
+				originX: T,
+				originY: E
+			}), k = this._resolveMinimumTextFitHeight({
 				text: t,
-				width: S,
+				width: g.startWidth,
 				padding: n
 			});
 			i = {
-				baseWidth: S,
-				baseHeight: C,
-				baseRounding: Math.max(0, (y = e.shapeRounding) == null ? 0 : y),
-				cannotScaleDownAtStart: ee >= C - Z,
+				startWidth: g.startWidth,
+				startHeight: g.startHeight,
+				startManualBaseWidth: g.startManualBaseWidth,
+				startManualBaseHeight: g.startManualBaseHeight,
+				canScaleWidth: g.canScaleWidth,
+				canScaleHeight: g.canScaleHeight,
+				baseRounding: Math.max(0, (p = e.shapeRounding) == null ? 0 : p),
+				cannotScaleDownAtStart: k >= g.startHeight - Z,
 				isProportionalScaling: !1,
 				blockedScaleAttempt: !1,
-				startLeft: A,
-				startTop: j,
-				startScaleX: O,
-				startScaleY: k,
-				startTransformOriginX: M,
-				startTransformOriginY: N,
-				startTransformCorner: P,
-				scalingAnchorX: (b = F == null ? void 0 : F.x) == null ? null : b,
-				scalingAnchorY: (x = F == null ? void 0 : F.y) == null ? null : x,
-				scalingAnchorOriginX: M,
-				scalingAnchorOriginY: N,
+				startLeft: C,
+				startTop: w,
+				startScaleX: x,
+				startScaleY: S,
+				startTransformOriginX: T,
+				startTransformOriginY: E,
+				startTransformCorner: D,
+				scalingAnchorX: (m = O == null ? void 0 : O.x) == null ? null : m,
+				scalingAnchorY: (h = O == null ? void 0 : O.y) == null ? null : h,
+				scalingAnchorOriginX: T,
+				scalingAnchorOriginY: E,
 				crossedOppositeCorner: !1,
 				lastAllowedFlipX: !!e.flipX,
 				lastAllowedFlipY: !!e.flipY,
-				lastAllowedScaleX: O,
-				lastAllowedScaleY: k,
-				lastAllowedLeft: A,
-				lastAllowedTop: j
+				lastAllowedScaleX: x,
+				lastAllowedScaleY: S,
+				lastAllowedLeft: C,
+				lastAllowedTop: w
 			}, this.scalingState.set(e, i);
 		}
 		return i;
 	}
 	_resolveMinimumTextFitHeight({ text: e, width: t, padding: n }) {
-		return ln({
+		return un({
 			text: e,
 			width: t,
 			height: X,
@@ -4942,7 +5021,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		}
 		e.setPositionByOrigin(new p(n, r), i, a), e.setCoords();
 	}
-	_restoreShapeStateWithoutResize({ group: e, shape: t, text: n, state: r, baseWidth: i, baseHeight: a, alignH: o, alignV: s, padding: c }) {
+	_restoreShapeStateWithoutResize({ group: e, shape: t, text: n, state: r, startWidth: i, startHeight: a, alignH: o, alignV: s, padding: c }) {
 		var l, u, d, f;
 		on({
 			group: e,
@@ -4967,7 +5046,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	}
 	_restoreGroupTransformOnly({ group: e, shape: t, text: n, state: r }) {
 		var i, a, o, s;
-		let c = Math.max(X, (i = (a = e.shapeBaseWidth) == null ? e.width : a) == null ? r.baseWidth : i), l = Math.max(X, (o = (s = e.shapeBaseHeight) == null ? e.height : s) == null ? r.baseHeight : o);
+		let c = Math.max(X, (i = (a = e.shapeBaseWidth) == null ? e.width : a) == null ? r.startWidth : i), l = Math.max(X, (o = (s = e.shapeBaseHeight) == null ? e.height : s) == null ? r.startHeight : o);
 		t && (Pt({
 			shape: t,
 			width: c,
@@ -4991,20 +5070,41 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			state: r
 		});
 	}
-}, fr = class {
+	_resolveScalingStartDimensions({ group: e, transform: t }) {
+		var n, r, i, a, o, s, c, l;
+		let { canScaleWidth: u, canScaleHeight: d } = ar({ transform: t }), f = Math.max(X, (n = (r = (i = e.shapeBaseWidth) == null ? e.width : i) == null ? e.shapeManualBaseWidth : r) == null ? X : n), p = Math.max(X, (a = (o = (s = e.shapeBaseHeight) == null ? e.height : s) == null ? e.shapeManualBaseHeight : o) == null ? X : a);
+		return {
+			startWidth: f,
+			startHeight: p,
+			startManualBaseWidth: Math.max(X, (c = e.shapeManualBaseWidth) == null ? f : c),
+			startManualBaseHeight: Math.max(X, (l = e.shapeManualBaseHeight) == null ? p : l),
+			canScaleWidth: u,
+			canScaleHeight: d
+		};
+	}
+	_resolveNextManualBaseDimensionsAfterScaling({ startManualBaseWidth: e, startManualBaseHeight: t, canScaleWidth: n, canScaleHeight: r, finalWidth: i, finalHeight: a }) {
+		let o = e;
+		n && (o = i);
+		let s = t;
+		return r && (s = a), {
+			width: o,
+			height: s
+		};
+	}
+}, gr = class {
 	constructor({ canvas: e }) {
 		this.handleMouseDown = (e) => {
-			let { target: t, e: n, subTargets: r = [] } = e, i = qn({
+			let { target: t, e: n, subTargets: r = [] } = e, i = Zn({
 				target: t,
 				subTargets: r
 			});
 			if (!i) return;
-			let { text: a } = Xn({ group: i });
+			let { text: a } = er({ group: i });
 			if (!a) return;
 			let o = this.canvas.getActiveObject(), s = o === i;
 			if (!(o === a && a.isEditing)) {
 				if (!s) {
-					a.isEditing || An({ text: a });
+					a.isEditing || Pn({ text: a });
 					return;
 				}
 				n instanceof MouseEvent && (n.detail < 2 || this.enterTextEditing({ group: i }));
@@ -5024,11 +5124,11 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			Y(r) && (this._restoreTextEditingInteractionMode({
 				group: r,
 				text: n
-			}), An({ text: n }), this.canvas.getActiveObject() === n && this.canvas.setActiveObject(r), this.canvas.requestRenderAll());
+			}), Pn({ text: n }), this.canvas.getActiveObject() === n && this.canvas.setActiveObject(r), this.canvas.requestRenderAll());
 		}, this.canvas = e, this.editingInteractionState = /* @__PURE__ */ new WeakMap();
 	}
 	enterTextEditing({ group: e }) {
-		let { text: t } = Xn({ group: e });
+		let { text: t } = er({ group: e });
 		t && (this._enterTextEditingInteractionMode({
 			group: e,
 			text: t
@@ -5039,6 +5139,20 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			lockMovementY: !0
 		}), this.canvas.setActiveObject(t), t.isEditing || (t.enterEditing(), t.selectAll()), this.canvas.requestRenderAll());
 	}
+	resolveGroupInteractionState({ group: e }) {
+		let t = this.editingInteractionState.get(e);
+		return t ? {
+			selectable: t.groupSelectable,
+			evented: t.groupEvented,
+			lockMovementX: t.groupLockMovementX,
+			lockMovementY: t.groupLockMovementY
+		} : {
+			selectable: e.selectable !== !1,
+			evented: e.evented !== !1,
+			lockMovementX: !!e.lockMovementX,
+			lockMovementY: !!e.lockMovementY
+		};
+	}
 	_enterTextEditingInteractionMode({ group: e, text: t }) {
 		this.editingInteractionState.has(e) || this.editingInteractionState.set(e, {
 			groupSelectable: e.selectable !== !1,
@@ -5075,7 +5189,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			lockMovementY: n.textLockMovementY
 		}), this.editingInteractionState.delete(e), e.setCoords(), t.setCoords());
 	}
-}, pr = "#B0B5BF", mr = 0, hr = 1, gr = class {
+}, _r = "#B0B5BF", vr = 0, yr = 1, br = class {
 	constructor({ editor: e }) {
 		this._handleObjectScaling = (e) => {
 			this.scalingController.handleObjectScaling(e);
@@ -5119,7 +5233,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 				textNode: r,
 				textStyle: n
 			});
-		}, this.editor = e, Kn(), this.scalingController = new dr({ canvas: e.canvas }), this.editingController = new fr({ canvas: e.canvas }), this.editingCenters = /* @__PURE__ */ new WeakMap(), this.internalTextUpdates = /* @__PURE__ */ new WeakSet(), this._bindEvents();
+		}, this.editor = e, Xn(), this.scalingController = new hr({ canvas: e.canvas }), this.editingController = new gr({ canvas: e.canvas }), this.editingCenters = /* @__PURE__ */ new WeakMap(), this.internalTextUpdates = /* @__PURE__ */ new WeakSet(), this._bindEvents();
 	}
 	add() {
 		var e = this;
@@ -5127,56 +5241,66 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			var r;
 			let i = Dt({ presetKey: t });
 			if (!i) return null;
-			let { width: a, height: o, left: s, top: c, text: l, textStyle: u, alignH: d, alignV: f, textPadding: p, rounding: m, withoutAdding: h, withoutSelection: g, withoutSave: _, id: v } = n, y = (r = Dt({ presetKey: Ot({
+			let { width: a, height: o, shapeTextAutoExpand: s, left: c, top: l, text: u, textStyle: d, alignH: f, alignV: p, textPadding: m, rounding: h, withoutAdding: g, withoutSelection: _, withoutSave: v, id: y } = n, b = (r = Dt({ presetKey: Ot({
 				preset: i,
-				rounding: m
-			}) })) == null ? i : r, b = Math.max(1, a == null ? y.width : a), x = Math.max(1, o == null ? y.height : o), S = e._resolveHorizontalAlign({
-				explicitAlign: d,
-				textStyle: u
-			}), C = f == null ? wt : f, w = kt({
-				preset: y,
-				overridePadding: p
-			}), T = e._resolveShapeStyle({
+				rounding: h
+			}) })) == null ? i : r, x = Math.max(1, a == null ? b.width : a), S = Math.max(1, o == null ? b.height : o), C = s !== !1, w = e._resolveHorizontalAlign({
+				explicitAlign: f,
+				textStyle: d
+			}), T = p == null ? wt : p, E = kt({
+				preset: b,
+				overridePadding: m
+			}), O = e._resolveShapeStyle({
 				options: n,
 				fallback: null
-			}), E = yield Ft({
-				preset: y,
-				width: b,
-				height: x,
-				style: T,
-				rounding: m
-			}), O = e._createTextNode({
-				text: l,
-				textStyle: u,
-				width: b,
-				align: S,
-				opacity: T.opacity
-			}), k = e._createShapeGroup({
-				id: v == null ? `shape-${D()}` : v,
-				presetKey: y.key,
-				presetCanRound: At({ preset: y }),
-				shape: E,
-				text: O,
-				width: b,
-				height: x,
-				alignH: S,
-				alignV: C,
-				padding: w,
-				style: T,
-				rounding: m
-			}), A = dn({
-				left: s,
-				top: c,
+			}), k = e._createTextNode({
+				text: u,
+				textStyle: d,
+				width: x,
+				align: w,
+				opacity: O.opacity
+			}), A = e._resolveShapeLayoutWidth({
+				text: k,
+				currentWidth: x,
+				manualWidth: x,
+				shapeTextAutoExpandEnabled: C,
+				padding: E,
+				strokeWidth: O.strokeWidth
+			}), j = yield Ft({
+				preset: b,
+				width: A,
+				height: S,
+				style: O,
+				rounding: h
+			}), M = e._createShapeGroup({
+				id: y == null ? `shape-${D()}` : y,
+				presetKey: b.key,
+				presetCanRound: At({ preset: b }),
+				shape: j,
+				text: k,
+				width: A,
+				height: S,
+				manualWidth: x,
+				manualHeight: S,
+				shapeTextAutoExpand: C,
+				alignH: w,
+				alignV: T,
+				padding: E,
+				style: O,
+				rounding: h
+			}), N = fn({
+				left: c,
+				top: l,
 				canvasCenter: e.editor.canvas.getCenterPoint()
 			});
-			if (k.setPositionByOrigin(A, "center", "center"), k.setCoords(), h) return k;
+			if (M.setPositionByOrigin(N, "center", "center"), M.setCoords(), g) return M;
 			e._beginMutation();
 			try {
-				e.editor.canvas.add(k), g || e.editor.canvas.setActiveObject(k), e.editor.canvas.requestRenderAll();
+				e.editor.canvas.add(M), _ || e.editor.canvas.setActiveObject(M), e.editor.canvas.requestRenderAll();
 			} finally {
-				e._endMutation({ withoutSave: _ });
+				e._endMutation({ withoutSave: v });
 			}
-			return k;
+			return M;
 		}).apply(this, arguments);
 	}
 	update() {
@@ -5187,23 +5311,25 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			if (!d) return null;
 			let f = Dt({ presetKey: (i = n == null ? d.shapePresetKey : n) == null ? St : i });
 			if (!f) return null;
-			let { width: p, height: m, text: h, textStyle: g, alignH: _, alignV: v, textPadding: y, rounding: b, withoutSelection: x, withoutSave: S } = r, C = e._resolveCurrentDimensions({ group: d }), w = Math.max(1, p == null ? C.width : p), T = Math.max(1, m == null ? C.height : m), E = (a = b == null ? d.shapeRounding : b) == null ? 0 : a, O = (o = Dt({ presetKey: Ot({
+			let { width: p, height: m, shapeTextAutoExpand: h, text: g, textStyle: _, alignH: v, alignV: y, textPadding: b, rounding: x, withoutSelection: S, withoutSave: C } = r, w = e._resolveCurrentDimensions({ group: d }), T = Math.max(1, m == null ? w.height : m), E = e._isShapeTextAutoExpandEnabled({ group: d }), O = h === void 0 ? E : h !== !1, k = (a = x == null ? d.shapeRounding : x) == null ? 0 : a, A = (o = Dt({ presetKey: Ot({
 				preset: f,
-				rounding: E
-			}) })) == null ? f : o, k = (s = _ == null ? d.shapeAlignHorizontal : _) == null ? Ct : s, A = (c = v == null ? d.shapeAlignVertical : v) == null ? wt : c, j = e._resolveGroupPadding({ group: d }), M = kt({
-				preset: O,
-				overridePadding: y == null ? j : y
-			}), N = e._resolveShapeStyle({
+				rounding: k
+			}) })) == null ? f : o, j = (s = v == null ? d.shapeAlignHorizontal : v) == null ? Ct : s, M = (c = y == null ? d.shapeAlignVertical : y) == null ? wt : c, N = e._resolveGroupPadding({ group: d }), ee = kt({
+				preset: A,
+				overridePadding: b == null ? N : b
+			}), P = e._resolveShapeStyle({
 				options: r,
 				fallback: d
-			}), P = Math.max(1, (l = p == null ? d.shapeManualBaseWidth : p) == null ? w : l), F = Math.max(1, (u = m == null ? d.shapeManualBaseHeight : m) == null ? T : u), ee = d.getCenterPoint(), { id: I, angle: L = 0, customData: te, evented: R = !0, flipX: z = !1, flipY: ne = !1, lockMovementX: re = !1, lockMovementY: ie = !1, lockRotation: B = !1, lockScalingX: ae = !1, lockScalingY: oe = !1, lockSkewingX: se = !1, lockSkewingY: V = !1, locked: ce = !1, selectable: le = !0 } = d, { text: ue } = Xn({ group: d });
-			if (!ue) return null;
-			let de = d.removeAll(), H = e._findTextNode({
+			}), F = Math.max(1, (l = d.shapeManualBaseWidth) == null ? w.width : l);
+			p !== void 0 && (F = Math.max(1, p)), p === void 0 && E && !O && (F = Math.max(1, w.width));
+			let I = Math.max(1, (u = m == null ? d.shapeManualBaseHeight : m) == null ? T : u), L = e.editingController.resolveGroupInteractionState({ group: d }), te = d.getCenterPoint(), { id: R, angle: z = 0, customData: ne, flipX: B = !1, flipY: re = !1, lockRotation: V = !1, lockScalingX: ie = !1, lockScalingY: ae = !1, lockSkewingX: oe = !1, lockSkewingY: H = !1, locked: se = !1 } = d, { selectable: ce, evented: le, lockMovementX: ue, lockMovementY: U } = L, { text: W } = er({ group: d });
+			if (!W) return null;
+			let de = d.removeAll(), fe = e._findTextNode({
 				objects: de,
-				fallback: ue
+				fallback: W
 			});
-			if (!H) return null;
-			H.set({
+			if (!fe) return null;
+			fe.set({
 				angle: 0,
 				skewX: 0,
 				skewY: 0,
@@ -5217,56 +5343,64 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 				originX: "left",
 				originY: "top"
 			}), e._applyTextUpdates({
-				textNode: H,
-				text: h,
-				textStyle: g,
-				align: k
+				textNode: fe,
+				text: g,
+				textStyle: _,
+				align: j
 			});
-			let U = yield Ft({
-				preset: O,
-				width: w,
+			let pe = e._resolveShapeLayoutWidth({
+				text: fe,
+				currentWidth: w.width,
+				manualWidth: F,
+				shapeTextAutoExpandEnabled: O,
+				padding: ee,
+				strokeWidth: P.strokeWidth
+			}), me = yield Ft({
+				preset: A,
+				width: pe,
 				height: T,
-				style: N,
-				rounding: E
-			}), W = e._createShapeGroup({
-				id: I == null ? `shape-${D()}` : I,
-				presetKey: O.key,
-				presetCanRound: At({ preset: O }),
-				shape: U,
-				text: H,
-				width: w,
+				style: P,
+				rounding: k
+			}), he = e._createShapeGroup({
+				id: R == null ? `shape-${D()}` : R,
+				presetKey: A.key,
+				presetCanRound: At({ preset: A }),
+				shape: me,
+				text: fe,
+				width: pe,
 				height: T,
-				manualWidth: P,
-				manualHeight: F,
-				alignH: k,
-				alignV: A,
-				padding: M,
-				style: N,
-				rounding: E
+				manualWidth: F,
+				manualHeight: I,
+				shapeTextAutoExpand: O,
+				alignH: j,
+				alignV: M,
+				padding: ee,
+				style: P,
+				rounding: k
 			});
-			if (W.set({
-				angle: L,
-				customData: te,
-				evented: R,
-				flipX: z,
-				flipY: ne,
-				lockMovementX: re,
-				lockMovementY: ie,
-				lockRotation: B,
-				lockScalingX: ae,
-				lockScalingY: oe,
-				lockSkewingX: se,
-				lockSkewingY: V,
-				locked: ce,
-				selectable: le
-			}), W.setPositionByOrigin(ee, "center", "center"), W.setCoords(), !e._isOnCanvas({ object: d })) return W;
+			if (he.set({
+				angle: z,
+				customData: ne,
+				evented: le,
+				flipX: B,
+				flipY: re,
+				lockMovementX: ue,
+				lockMovementY: U,
+				lockRotation: V,
+				lockScalingX: ie,
+				lockScalingY: ae,
+				lockSkewingX: oe,
+				lockSkewingY: H,
+				locked: se,
+				selectable: ce
+			}), he.setPositionByOrigin(te, "center", "center"), he.setCoords(), !e._isOnCanvas({ object: d })) return he;
 			e._beginMutation();
 			try {
-				e.editor.canvas.remove(d), e.editor.canvas.add(W), x || e.editor.canvas.setActiveObject(W), e.editor.canvas.requestRenderAll();
+				e.editor.canvas.remove(d), e.editor.canvas.add(he), S || e.editor.canvas.setActiveObject(he), e.editor.canvas.requestRenderAll();
 			} finally {
-				e._endMutation({ withoutSave: S });
+				e._endMutation({ withoutSave: C });
 			}
-			return W;
+			return he;
 		}).apply(this, arguments);
 	}
 	remove({ target: e, withoutSave: t } = {}) {
@@ -5283,7 +5417,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	setFill({ target: e, fill: t, withoutSave: n }) {
 		let r = this._resolveShapeGroup({ target: e });
 		if (!r) return null;
-		let { shape: i } = Xn({ group: r });
+		let { shape: i } = er({ group: r });
 		if (!i) return null;
 		this._beginMutation();
 		try {
@@ -5299,7 +5433,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	setStroke({ target: e, stroke: t, strokeWidth: n, dash: r, withoutSave: i }) {
 		let a = this._resolveShapeGroup({ target: e });
 		if (!a) return null;
-		let { shape: o, text: s } = Xn({ group: a });
+		let { shape: o, text: s } = er({ group: a });
 		if (!o) return null;
 		this._beginMutation();
 		try {
@@ -5323,7 +5457,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	setOpacity({ target: e, opacity: t, withoutSave: n }) {
 		let r = this._resolveShapeGroup({ target: e });
 		if (!r) return null;
-		let { shape: i, text: a } = Xn({ group: r });
+		let { shape: i, text: a } = er({ group: r });
 		if (!i) return null;
 		this._beginMutation();
 		try {
@@ -5339,13 +5473,13 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	getTextNode({ target: e } = {}) {
 		let t = this._resolveShapeGroup({ target: e });
 		if (!t) return null;
-		let { text: n } = Xn({ group: t });
+		let { text: n } = er({ group: t });
 		return n || null;
 	}
 	updateTextStyle({ target: e, style: t = {}, withoutSave: n } = {}) {
 		let r = this._resolveShapeGroup({ target: e });
 		if (!r) return null;
-		let { shape: i, text: a } = Xn({ group: r });
+		let { shape: i, text: a } = er({ group: r });
 		if (!i || !a) return null;
 		if (!(Object.keys(t).length > 0)) return r;
 		let o = this._resolveManualDimensions({ group: r }), s = r.getCenterPoint(), c = this._resolveShapeTextHorizontalAlign({
@@ -5366,7 +5500,6 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 					x: s.x,
 					y: s.y
 				},
-				width: o.width,
 				height: o.height,
 				alignH: c
 			}), this.editor.canvas.requestRenderAll();
@@ -5379,7 +5512,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		var i, a;
 		let o = this._resolveShapeGroup({ target: e });
 		if (!o) return null;
-		let { shape: s, text: c } = Xn({ group: o });
+		let { shape: s, text: c } = er({ group: o });
 		if (!s || !c) return null;
 		let l = this._resolveCurrentDimensions({ group: o }), u = (i = t == null ? o.shapeAlignHorizontal : t) == null ? Ct : i, d = (a = n == null ? o.shapeAlignVertical : n) == null ? wt : a, f = this._resolveGroupPadding({ group: o });
 		this._beginMutation();
@@ -5429,9 +5562,9 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		let { canvas: e } = this.editor;
 		e.on("object:scaling", this._handleObjectScaling), e.on("object:modified", this._handleObjectModified), e.on("mouse:move", this._handleMouseMove), e.on("mouse:down", this._handleMouseDown), e.on("text:editing:entered", this._handleTextEditingEntered), e.on("text:editing:exited", this._handleTextEditingExited), e.on("text:changed", this._handleTextChanged), e.on("editor:before:text-updated", this._handleBeforeTextUpdated);
 	}
-	_createShapeGroup({ id: e, presetKey: t, presetCanRound: n, shape: r, text: i, width: a, height: o, manualWidth: s, manualHeight: c, alignH: l, alignV: u, padding: d, style: f, rounding: p }) {
-		var m;
-		let h = new Gn([r, i], {
+	_createShapeGroup({ id: e, presetKey: t, presetCanRound: n, shape: r, text: i, width: a, height: o, manualWidth: s, manualHeight: c, shapeTextAutoExpand: l, alignH: u, alignV: d, padding: f, style: p, rounding: m }) {
+		var h;
+		let g = new Yn([r, i], {
 			id: e,
 			originX: "center",
 			originY: "center",
@@ -5440,41 +5573,42 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			lockScalingFlip: !0,
 			centeredScaling: !1,
 			objectCaching: !1
-		}), g = f.strokeDashArray ? f.strokeDashArray.slice() : (m = f.strokeDashArray) == null ? null : m;
-		return h.set({
+		}), _ = p.strokeDashArray ? p.strokeDashArray.slice() : (h = p.strokeDashArray) == null ? null : h;
+		return g.set({
 			shapeComposite: !0,
 			shapePresetKey: t,
 			shapeBaseWidth: a,
 			shapeBaseHeight: o,
 			shapeManualBaseWidth: Math.max(1, s == null ? a : s),
 			shapeManualBaseHeight: Math.max(1, c == null ? o : c),
-			shapeAlignHorizontal: l,
-			shapeAlignVertical: u,
-			shapePaddingTop: d.top,
-			shapePaddingRight: d.right,
-			shapePaddingBottom: d.bottom,
-			shapePaddingLeft: d.left,
-			shapeFill: f.fill,
-			shapeStroke: f.stroke,
-			shapeStrokeWidth: f.strokeWidth,
-			shapeStrokeDashArray: g,
-			shapeOpacity: f.opacity,
-			shapeRounding: Math.max(0, p == null ? 0 : p),
+			shapeTextAutoExpand: l,
+			shapeAlignHorizontal: u,
+			shapeAlignVertical: d,
+			shapePaddingTop: f.top,
+			shapePaddingRight: f.right,
+			shapePaddingBottom: f.bottom,
+			shapePaddingLeft: f.left,
+			shapeFill: p.fill,
+			shapeStroke: p.stroke,
+			shapeStrokeWidth: p.strokeWidth,
+			shapeStrokeDashArray: _,
+			shapeOpacity: p.opacity,
+			shapeRounding: Math.max(0, m == null ? 0 : m),
 			shapeCanRound: n
-		}), h.rehydrateRuntimeState(), Zn({ group: h }), An({ text: i }), on({
-			group: h,
+		}), g.rehydrateRuntimeState(), tr({ group: g }), Pn({ text: i }), on({
+			group: g,
 			shape: r,
 			text: i,
 			width: a,
 			height: o,
-			alignH: l,
-			alignV: u,
-			padding: d
-		}), this._detachShapeGroupAutoLayout({ group: h }), h;
+			alignH: u,
+			alignV: d,
+			padding: f
+		}), this._detachShapeGroupAutoLayout({ group: g }), g;
 	}
 	_createTextNode({ text: e, textStyle: t, width: n, align: r, opacity: i }) {
 		var a;
-		let o = t == null ? {} : t, s = H(H({}, o), {}, {
+		let o = t == null ? {} : t, s = U(U({}, o), {}, {
 			text: (a = e == null ? o.text : e) == null ? "" : a,
 			align: r,
 			autoExpand: !1,
@@ -5492,7 +5626,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		return c.set({
 			shapeNodeType: "text",
 			splitByGrapheme: !1
-		}), An({ text: c }), c;
+		}), Pn({ text: c }), c;
 	}
 	_applyTextUpdates({ textNode: e, text: t, textStyle: n, align: r }) {
 		let i = {};
@@ -5541,6 +5675,37 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			left: (i = e.shapePaddingLeft) == null ? .2 : i
 		};
 	}
+	_isShapeTextAutoExpandEnabled({ group: e }) {
+		return e.shapeTextAutoExpand !== !1;
+	}
+	_resolveMontageAreaWidth() {
+		var e;
+		let { montageArea: t } = this.editor;
+		if (!t) return null;
+		t.setCoords();
+		let n = (e = t.getBoundingRect().width) == null ? 0 : e;
+		return !Number.isFinite(n) || n <= 0 ? null : n;
+	}
+	_resolveAutoExpandShapeWidth({ text: e, currentWidth: t, minimumWidth: n, padding: r, strokeWidth: i }) {
+		let a = this._resolveMontageAreaWidth();
+		return a ? sn({
+			text: e,
+			currentWidth: t,
+			minimumWidth: n,
+			padding: r,
+			strokeWidth: i,
+			montageAreaWidth: a
+		}) : Math.max(1, t, n);
+	}
+	_resolveShapeLayoutWidth({ text: e, currentWidth: t, manualWidth: n, shapeTextAutoExpandEnabled: r, padding: i, strokeWidth: a }) {
+		return r ? this._resolveAutoExpandShapeWidth({
+			text: e,
+			currentWidth: t,
+			minimumWidth: n,
+			padding: i,
+			strokeWidth: a
+		}) : Math.max(1, n);
+	}
 	_resolveShapeTextHorizontalAlign({ group: e, textStyle: t }) {
 		var n;
 		let r = t == null ? void 0 : t.align;
@@ -5548,28 +5713,37 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	}
 	_applyCurrentLayout({ group: e, shape: t, text: n, center: r, width: i, height: a, alignH: o, alignV: s }) {
 		var c, l;
-		let u = this._resolveCurrentDimensions({ group: e }), d = Math.max(1, i == null ? u.width : i), f = Math.max(1, a == null ? u.height : a), p = this._resolveGroupPadding({ group: e }), m = e.getCenterPoint(), h = r == null ? {
-			x: m.x,
-			y: m.y
+		let u = this._resolveCurrentDimensions({ group: e }), d = this._resolveManualDimensions({ group: e }), f = this._resolveGroupPadding({ group: e }), p = u.width;
+		p = i === void 0 ? this._resolveShapeLayoutWidth({
+			text: n,
+			currentWidth: u.width,
+			manualWidth: d.width,
+			shapeTextAutoExpandEnabled: this._isShapeTextAutoExpandEnabled({ group: e }),
+			padding: f,
+			strokeWidth: e.shapeStrokeWidth
+		}) : Math.max(1, i);
+		let m = Math.max(1, a == null ? u.height : a), h = e.getCenterPoint(), g = r == null ? {
+			x: h.x,
+			y: h.y
 		} : r;
 		on({
 			group: e,
 			shape: t,
 			text: n,
-			width: d,
-			height: f,
+			width: p,
+			height: m,
 			alignH: (c = o == null ? e.shapeAlignHorizontal : o) == null ? Ct : c,
 			alignV: (l = s == null ? e.shapeAlignVertical : s) == null ? wt : l,
-			padding: p
+			padding: f
 		}), e.set({
-			left: h.x,
-			top: h.y
+			left: g.x,
+			top: g.y
 		}), e.setCoords();
 	}
 	_syncShapeTextLayoutAfterTextMutation({ textNode: e, textStyle: t }) {
 		let { group: n } = e;
 		if (!Y(n)) return !1;
-		let { shape: r, text: i } = Xn({ group: n });
+		let { shape: r, text: i } = er({ group: n });
 		if (!r || !i) return !1;
 		this._detachShapeGroupAutoLayout({ group: n });
 		let a = this._resolveEditingCenter({ group: n }), o = this._resolveManualDimensions({ group: n }), s = this._resolveShapeTextHorizontalAlign({
@@ -5581,7 +5755,6 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			shape: r,
 			text: i,
 			center: a,
-			width: o.width,
 			height: o.height,
 			alignH: s
 		}), !0;
@@ -5596,7 +5769,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		};
 	}
 	_detachShapeGroupAutoLayout({ group: e }) {
-		jn({ group: e });
+		Fn({ group: e });
 	}
 	_resolveHorizontalAlign({ explicitAlign: e, textStyle: t }) {
 		if (e) return e;
@@ -5607,11 +5780,11 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		var n, r, i, a;
 		let { fill: o, stroke: s, strokeWidth: c, strokeDashArray: l, opacity: u } = e, d = l === void 0 ? t == null ? void 0 : t.shapeStrokeDashArray : l;
 		return {
-			fill: (n = o == null ? t == null ? void 0 : t.shapeFill : o) == null ? pr : n,
+			fill: (n = o == null ? t == null ? void 0 : t.shapeFill : o) == null ? _r : n,
 			stroke: (r = s == null ? t == null ? void 0 : t.shapeStroke : s) == null ? null : r,
-			strokeWidth: (i = c == null ? t == null ? void 0 : t.shapeStrokeWidth : c) == null ? mr : i,
+			strokeWidth: (i = c == null ? t == null ? void 0 : t.shapeStrokeWidth : c) == null ? vr : i,
 			strokeDashArray: d == null ? null : d,
-			opacity: (a = u == null ? t == null ? void 0 : t.shapeOpacity : u) == null ? hr : a
+			opacity: (a = u == null ? t == null ? void 0 : t.shapeOpacity : u) == null ? yr : a
 		};
 	}
 	_findTextNode({ objects: e, fallback: t }) {
@@ -5654,7 +5827,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		}
 		return null;
 	}
-}, _r = class {
+}, xr = class {
 	constructor({ editor: e }) {
 		this.editor = e, this.clipboard = null;
 	}
@@ -5800,7 +5973,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		var n = this;
 		return k(function* () {
 			var r;
-			let i = H(H({ source: e }, t), {}, { fromClipboard: !0 }), a = yield n.editor.imageManager.importImage(i), o = a == null ? void 0 : a.image, s = (r = a == null ? void 0 : a.source) == null ? e : r;
+			let i = U(U({ source: e }, t), {}, { fromClipboard: !0 }), a = yield n.editor.imageManager.importImage(i), o = a == null ? void 0 : a.image, s = (r = a == null ? void 0 : a.source) == null ? e : r;
 			o && n.editor.canvas.fire("editor:object-pasted", {
 				imageSource: s,
 				fromInternalClipboard: !1,
@@ -5923,7 +6096,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			}
 		})();
 	}
-}, vr = class t {
+}, Sr = class t {
 	constructor({ editor: e }) {
 		this.editor = e;
 	}
@@ -5973,7 +6146,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	static _isGroupOrSelection(t) {
 		return t instanceof e || t instanceof l;
 	}
-}, yr = class {
+}, Cr = class {
 	constructor({ editor: e }) {
 		this.editor = e;
 	}
@@ -6039,7 +6212,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			i.resumeHistory(), n || i.saveState();
 		}
 	}
-}, br = class t {
+}, wr = class t {
 	constructor({ editor: e }) {
 		this.lastSelection = [], this.isCtrlSelectionBoxActive = !1, this.isSelectionMergeInProgress = !1, this.editor = e, this.selectionKey = this._resolveSelectionKey(), this.handleTextEditingEnteredBound = this._handleTextEditingEntered.bind(this), this.handleTextEditingExitedBound = this._handleTextEditingExited.bind(this), this.handleLockedSelectionBound = this._filterLockedSelection.bind(this), this.handleSelectionMergeBound = this._handleSelectionMerge.bind(this), this.handleSelectionChangeBound = this._handleSelectionChange.bind(this), this.handleSelectionClearedBound = this._handleSelectionCleared.bind(this), this.handleSelectionBoxStartBound = this._handleSelectionBoxStart.bind(this), this.handleSelectionBoxEndBound = this._handleSelectionBoxEnd.bind(this), this._applySelectionKey({ selectionKey: this.selectionKey }), this._bindEvents();
 	}
@@ -6233,7 +6406,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		let { options: e } = this.editor, { selectionKey: t } = e;
 		return t === void 0 ? ["ctrlKey", "metaKey"] : t;
 	}
-}, xr = class e {
+}, Tr = class e {
 	constructor({ editor: e }) {
 		this.editor = e;
 	}
@@ -6272,7 +6445,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		};
 		return i.fire("editor:objects-deleted", c), c;
 	}
-}, Sr = {
+}, Er = {
 	IMAGE_MANAGER: {
 		INVALID_CONTENT_TYPE: "INVALID_CONTENT_TYPE",
 		INVALID_SOURCE_TYPE: "INVALID_SOURCE_TYPE",
@@ -6310,7 +6483,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		INVALID_TARGET: "TEMPLATE_INVALID_TARGET",
 		APPLY_FAILED: "TEMPLATE_APPLY_FAILED"
 	}
-}, Cr = class e {
+}, Dr = class e {
 	constructor({ editor: e }) {
 		this._buffer = [], this.editor = e;
 	}
@@ -6339,7 +6512,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			message: o,
 			data: i
 		};
-		this._buffer.push(H({ type: "editor:error" }, s)), this.editor.canvas.fire("editor:error", s);
+		this._buffer.push(U({ type: "editor:error" }, s)), this.editor.canvas.fire("editor:error", s);
 	}
 	emitWarning({ origin: t = "ImageEditor", method: n = "Unknown Method", code: r, message: i, data: a }) {
 		if (!e.isValidErrorCode(r)) {
@@ -6359,12 +6532,12 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 			message: o,
 			data: a
 		};
-		this._buffer.push(H({ type: "editor:warning" }, s)), this.editor.canvas.fire("editor:warning", s);
+		this._buffer.push(U({ type: "editor:warning" }, s)), this.editor.canvas.fire("editor:warning", s);
 	}
 	static isValidErrorCode(e) {
-		return e ? Object.values(Sr).some((t) => Object.values(t).includes(e)) : !1;
+		return e ? Object.values(Er).some((t) => Object.values(t).includes(e)) : !1;
 	}
-}, wr = class {
+}, Or = class {
 	constructor({ editor: e }) {
 		this.currentBounds = null, this.editor = e;
 	}
@@ -6414,7 +6587,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	updateBounds() {
 		this.currentBounds = this.calculatePanBounds();
 	}
-}, Tr = ({ textbox: e }) => {
+}, kr = ({ textbox: e }) => {
 	var t, n;
 	if (!e.isEditing) return null;
 	let r = (t = e.selectionStart) == null ? 0 : t, i = (n = e.selectionEnd) == null ? r : n;
@@ -6422,28 +6595,28 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		start: Math.min(r, i),
 		end: Math.max(r, i)
 	};
-}, Er = ({ textbox: e }) => {
+}, Ar = ({ textbox: e }) => {
 	var t, n;
 	let r = (t = (n = e.text) == null ? void 0 : n.length) == null ? 0 : t;
 	return r <= 0 ? null : {
 		start: 0,
 		end: r
 	};
-}, Dr = ({ textbox: e, range: t }) => {
+}, jr = ({ textbox: e, range: t }) => {
 	var n, r;
 	if (!t) return !1;
 	let i = (n = (r = e.text) == null ? void 0 : r.length) == null ? 0 : n;
 	return i <= 0 ? !1 : t.start <= 0 && t.end >= i;
-}, Or = ({ textbox: e, styles: t, range: n }) => {
+}, Mr = ({ textbox: e, styles: t, range: n }) => {
 	if (!t || !Object.keys(t).length) return !1;
 	let { start: r, end: i } = n;
 	return i <= r ? !1 : (e.setSelectionStyles(t, r, i), !0);
-}, kr = ({ textbox: e, range: t, property: n }) => {
+}, Nr = ({ textbox: e, range: t, property: n }) => {
 	var r;
 	if (!t) return;
 	let i = e.getSelectionStyles(t.start, t.end, !0);
 	if (i.length) return (r = i[0]) == null ? void 0 : r[n];
-}, Ar = ({ strokeColor: e, width: t }) => t <= 0 ? null : e == null ? "#000000" : e, jr = ({ width: e = 0 }) => e ? Math.max(0, e) : 0, Mr = ({ value: e }) => typeof e == "string" ? e.toLocaleUpperCase() : "", Nr, Pr = ({ value: e, min: t, max: n }) => Math.min(Math.max(e, t), n), Fr = class e extends _ {
+}, Pr = ({ strokeColor: e, width: t }) => t <= 0 ? null : e == null ? "#000000" : e, Fr = ({ width: e = 0 }) => e ? Math.max(0, e) : 0, Ir = ({ value: e }) => typeof e == "string" ? e.toLocaleUpperCase() : "", Lr, Rr = ({ value: e, min: t, max: n }) => Math.min(Math.max(e, t), n), zr = class e extends _ {
 	constructor(e, t = {}) {
 		var n, r, i, a, o, s, c, l, u, d;
 		super(e, t), this.backgroundOpacity = (n = t.backgroundOpacity) == null ? 1 : n, this.lineFontDefaults = (r = t.lineFontDefaults) == null ? void 0 : r, this.paddingTop = (i = t.paddingTop) == null ? 0 : i, this.paddingRight = (a = t.paddingRight) == null ? 0 : a, this.paddingBottom = (o = t.paddingBottom) == null ? 0 : o, this.paddingLeft = (s = t.paddingLeft) == null ? 0 : s, this.radiusTopLeft = (c = t.radiusTopLeft) == null ? 0 : c, this.radiusTopRight = (l = t.radiusTopRight) == null ? 0 : l, this.radiusBottomRight = (u = t.radiusBottomRight) == null ? 0 : u, this.radiusBottomLeft = (d = t.radiusBottomLeft) == null ? 0 : d, this._roundDimensions();
@@ -6465,13 +6638,13 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 	}
 	_getTransformedDimensions(e = {}) {
 		let { width: t, height: n } = this._getBackgroundDimensions();
-		return super._getTransformedDimensions(H(H({}, e), {}, {
+		return super._getTransformedDimensions(U(U({}, e), {}, {
 			width: t,
 			height: n
 		}));
 	}
 	toObject(e = []) {
-		return H(H({}, super.toObject(e)), {}, {
+		return U(U({}, super.toObject(e)), {}, {
 			backgroundOpacity: this.backgroundOpacity,
 			lineFontDefaults: this.lineFontDefaults,
 			paddingTop: this.paddingTop,
@@ -6533,7 +6706,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		this._removeShadow(e);
 	}
 	_getDecorationColorAt(e, t) {
-		let n = this.getValueOfPropertyAt(e, t, "strokeWidth"), r = jr({ width: typeof n == "number" && Number.isFinite(n) ? n : 0 }), i = this.getValueOfPropertyAt(e, t, "stroke"), a = i == null ? null : Ar({
+		let n = this.getValueOfPropertyAt(e, t, "strokeWidth"), r = Fr({ width: typeof n == "number" && Number.isFinite(n) ? n : 0 }), i = this.getValueOfPropertyAt(e, t, "stroke"), a = i == null ? null : Pr({
 			strokeColor: i,
 			width: r
 		});
@@ -6553,22 +6726,22 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		var n, r, i, a;
 		let o = e / 2, s = t / 2, c = Math.min(o, s);
 		return {
-			bottomLeft: Pr({
+			bottomLeft: Rr({
 				value: (n = this.radiusBottomLeft) == null ? 0 : n,
 				min: 0,
 				max: c
 			}),
-			bottomRight: Pr({
+			bottomRight: Rr({
 				value: (r = this.radiusBottomRight) == null ? 0 : r,
 				min: 0,
 				max: c
 			}),
-			topLeft: Pr({
+			topLeft: Rr({
 				value: (i = this.radiusTopLeft) == null ? 0 : i,
 				min: 0,
 				max: c
 			}),
-			topRight: Pr({
+			topRight: Rr({
 				value: (a = this.radiusTopRight) == null ? 0 : a,
 				min: 0,
 				max: c
@@ -6588,7 +6761,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		var e;
 		let t = this.backgroundColor;
 		if (!t) return null;
-		let r = Pr({
+		let r = Rr({
 			value: (e = this.backgroundOpacity) == null ? 1 : e,
 			min: 0,
 			max: 1
@@ -6596,7 +6769,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		try {
 			i = new n(t);
 		} catch (e) {
-			return Cr.emitError({
+			return Dr.emitError({
 				origin: "BackgroundTextbox",
 				method: "_getEffectiveBackgroundFill",
 				code: "INVALID_COLOR_VALUE",
@@ -6610,19 +6783,19 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		return i.setAlpha(r), i.toRgba();
 	}
 	static _renderRoundedRect({ ctx: e, height: t, left: n, radii: r, top: i, width: a }) {
-		let o = n + a, s = i + t, { topLeft: c, topRight: l, bottomRight: u, bottomLeft: d } = r, f = Pr({
+		let o = n + a, s = i + t, { topLeft: c, topRight: l, bottomRight: u, bottomLeft: d } = r, f = Rr({
 			value: c,
 			min: 0,
 			max: a
-		}), p = Pr({
+		}), p = Rr({
 			value: l,
 			min: 0,
 			max: a
-		}), m = Pr({
+		}), m = Rr({
 			value: u,
 			min: 0,
 			max: a
-		}), h = Pr({
+		}), h = Rr({
 			value: d,
 			min: 0,
 			max: a
@@ -6634,7 +6807,7 @@ var lr = ({ group: e, shape: t, text: n, width: r, height: i, padding: a, alignH
 		n !== e && (this.width = Math.max(0, n)), r !== t && (this.height = Math.max(0, r));
 	}
 };
-Nr = Fr, Nr.type = "background-textbox", Nr.cacheProperties = [
+Lr = zr, Lr.type = "background-textbox", Lr.cacheProperties = [
 	...Array.isArray(_.cacheProperties) ? _.cacheProperties : [],
 	"backgroundColor",
 	"backgroundOpacity",
@@ -6647,7 +6820,7 @@ Nr = Fr, Nr.type = "background-textbox", Nr.cacheProperties = [
 	"radiusTopRight",
 	"radiusBottomRight",
 	"radiusBottomLeft"
-], Nr.stateProperties = [
+], Lr.stateProperties = [
 	...Array.isArray(_.stateProperties) ? _.stateProperties : [],
 	"backgroundColor",
 	"backgroundOpacity",
@@ -6661,9 +6834,9 @@ Nr = Fr, Nr.type = "background-textbox", Nr.cacheProperties = [
 	"radiusBottomRight",
 	"radiusBottomLeft"
 ];
-var Ir = () => {
-	y != null && y.setClass && y.setClass(Fr, "background-textbox");
-}, Lr = .01, Rr = ({ textbox: e, lineIndices: t, updates: n }) => {
+var Br = () => {
+	y != null && y.setClass && y.setClass(zr, "background-textbox");
+}, Vr = .01, Hr = ({ textbox: e, lineIndices: t, updates: n }) => {
 	if (!t.length) return !1;
 	let { fontFamily: r, fontSize: i, fill: a, stroke: o } = n;
 	if (!(r !== void 0 || i !== void 0 || a !== void 0 || o !== void 0)) return !1;
@@ -6671,11 +6844,11 @@ var Ir = () => {
 	for (let e = 0; e < t.length; e += 1) {
 		let n = t[e];
 		if (!Number.isFinite(n)) continue;
-		let d = u ? c[n] : s == null ? void 0 : s[n], f = d ? H({}, d) : {}, p = !1;
-		r !== void 0 && (d == null ? void 0 : d.fontFamily) !== r && (f.fontFamily = r, p = !0), i !== void 0 && (d == null ? void 0 : d.fontSize) !== i && (f.fontSize = i, p = !0), a !== void 0 && (d == null ? void 0 : d.fill) !== a && (f.fill = a, p = !0), o !== void 0 && (o === null && (d == null ? void 0 : d.stroke) !== void 0 && (delete f.stroke, p = !0), o !== null && (d == null ? void 0 : d.stroke) !== o && (f.stroke = o, p = !0)), p && (u || (c = H({}, c), u = !0), c[n] = f, l = !0);
+		let d = u ? c[n] : s == null ? void 0 : s[n], f = d ? U({}, d) : {}, p = !1;
+		r !== void 0 && (d == null ? void 0 : d.fontFamily) !== r && (f.fontFamily = r, p = !0), i !== void 0 && (d == null ? void 0 : d.fontSize) !== i && (f.fontSize = i, p = !0), a !== void 0 && (d == null ? void 0 : d.fill) !== a && (f.fill = a, p = !0), o !== void 0 && (o === null && (d == null ? void 0 : d.stroke) !== void 0 && (delete f.stroke, p = !0), o !== null && (d == null ? void 0 : d.stroke) !== o && (f.stroke = o, p = !0)), p && (u || (c = U({}, c), u = !0), c[n] = f, l = !0);
 	}
 	return l && (e.lineFontDefaults = c), l;
-}, zr = ({ lineText: e, lineStyles: t, lineDefaults: n }) => {
+}, Ur = ({ lineText: e, lineStyles: t, lineDefaults: n }) => {
 	let r = e.length;
 	if (r === 0) return {
 		lineStyles: t,
@@ -6692,23 +6865,23 @@ var Ir = () => {
 	if (t) for (let e in t) {
 		if (!Object.prototype.hasOwnProperty.call(t, e)) continue;
 		let n = Number(e);
-		Number.isInteger(n) && n >= 0 && n < r || (d || (l = H({}, t), d = !0), l && Object.prototype.hasOwnProperty.call(l, e) && delete l[e], u = !0);
+		Number.isInteger(n) && n >= 0 && n < r || (d || (l = U({}, t), d = !0), l && Object.prototype.hasOwnProperty.call(l, e) && delete l[e], u = !0);
 	}
 	for (let e = 0; e < r; e += 1) {
 		var f;
 		let n = (f = l) == null ? t : f, r = n ? n[e] : void 0;
 		if (!r) {
-			l || (l = {}, d = !0), d || (l = H({}, l), d = !0), l[e] = H({}, c), u = !0;
+			l || (l = {}, d = !0), d || (l = U({}, l), d = !0), l[e] = U({}, c), u = !0;
 			continue;
 		}
 		let p = null;
-		i !== void 0 && r.fontFamily === void 0 && (p = H({}, r), p.fontFamily = i), a !== void 0 && r.fontSize === void 0 && (p || (p = H({}, r)), p.fontSize = a), o !== void 0 && r.fill === void 0 && (p || (p = H({}, r)), p.fill = o), s !== void 0 && r.stroke === void 0 && (p || (p = H({}, r)), p.stroke = s), p && (l || (l = {}, d = !0), d || (l = H({}, l), d = !0), l[e] = p, u = !0);
+		i !== void 0 && r.fontFamily === void 0 && (p = U({}, r), p.fontFamily = i), a !== void 0 && r.fontSize === void 0 && (p || (p = U({}, r)), p.fontSize = a), o !== void 0 && r.fill === void 0 && (p || (p = U({}, r)), p.fill = o), s !== void 0 && r.stroke === void 0 && (p || (p = U({}, r)), p.stroke = s), p && (l || (l = {}, d = !0), d || (l = U({}, l), d = !0), l[e] = p, u = !0);
 	}
 	return {
 		lineStyles: l,
 		changed: u
 	};
-}, Br = ({ lineFontDefaults: e }) => {
+}, Wr = ({ lineFontDefaults: e }) => {
 	if (!e) return;
 	let t = {};
 	for (let n in e) {
@@ -6716,10 +6889,10 @@ var Ir = () => {
 		let r = Number(n);
 		if (!Number.isFinite(r)) continue;
 		let i = e[r];
-		i && (t[r] = H({}, i));
+		i && (t[r] = U({}, i));
 	}
 	return t;
-}, Vr = ({ lineFontDefaults: e, scale: t }) => {
+}, Gr = ({ lineFontDefaults: e, scale: t }) => {
 	if (!e || !Number.isFinite(t) || Math.abs(t - 1) < .01) return;
 	let n = {}, r = !1, i = !1;
 	for (let a in e) {
@@ -6728,11 +6901,11 @@ var Ir = () => {
 		if (!Number.isFinite(o)) continue;
 		let s = e[o];
 		if (!s) continue;
-		let c = H({}, s);
+		let c = U({}, s);
 		typeof s.fontSize == "number" && (c.fontSize = Math.max(1, s.fontSize * t), i = !0), n[o] = c, r = !0;
 	}
 	if (!(!r || !i)) return n;
-}, Hr = ({ textbox: e }) => {
+}, Kr = ({ textbox: e }) => {
 	var t;
 	let n = (t = e.text) == null ? "" : t;
 	if (!n.length) return [];
@@ -6746,7 +6919,7 @@ var Ir = () => {
 		});
 	}
 	return i;
-}, Ur = ({ range: e, text: t }) => {
+}, qr = ({ range: e, text: t }) => {
 	if (!e) return null;
 	let n = t.length;
 	if (n <= 0) return null;
@@ -6755,8 +6928,8 @@ var Ir = () => {
 		start: l,
 		end: u
 	};
-}, Wr = ({ textbox: e, range: t }) => {
-	let n = Hr({ textbox: e });
+}, Jr = ({ textbox: e, range: t }) => {
+	let n = Kr({ textbox: e });
 	if (!n.length) return t;
 	let { start: r } = t, { end: i } = t;
 	for (let e = 0; e < n.length; e += 1) {
@@ -6769,7 +6942,7 @@ var Ir = () => {
 		start: r,
 		end: i
 	};
-}, Gr = ({ textbox: e, range: t }) => {
+}, Yr = ({ textbox: e, range: t }) => {
 	var n;
 	let r = (n = e.text) == null ? "" : n;
 	if (!r.length) return [];
@@ -6780,7 +6953,7 @@ var Ir = () => {
 		a > n && i < r && s.push(e), c = r + 1;
 	}
 	return s;
-}, Kr = ({ textbox: e, range: t }) => {
+}, Xr = ({ textbox: e, range: t }) => {
 	var n;
 	let r = (n = e.text) == null ? "" : n;
 	if (!r.length) return [];
@@ -6791,34 +6964,34 @@ var Ir = () => {
 		i <= n && a >= r && s.push(e), c = r + 1;
 	}
 	return s;
-}, qr = ({ previous: e, next: t }) => {
+}, Zr = ({ previous: e, next: t }) => {
 	let n = Math.min(e.length, t.length);
 	for (let r = 0; r < n; r += 1) if (e[r] !== t[r]) return r;
 	return n;
-}, Jr = ({ text: e, charIndex: t }) => {
+}, Qr = ({ text: e, charIndex: t }) => {
 	let n = Math.max(0, Math.min(t, e.length)), r = 0;
 	for (let t = 0; t < n; t += 1) e[t] === "\n" && (r += 1);
 	return r;
-}, Yr = ({ text: e, lineIndex: t }) => {
+}, $r = ({ text: e, lineIndex: t }) => {
 	if (t <= 0) return 0;
 	let n = 0;
 	for (let r = 0; r < e.length; r += 1) if (e[r] === "\n" && (n += 1, n === t)) return r + 1;
 	return e.length;
-}, Xr = ({ textbox: e, text: t }) => {
+}, ei = ({ textbox: e, text: t }) => {
 	let { textLines: n } = e, r = Array.isArray(n) && n.length > 0 ? n.length : Math.max(t.split("\n").length, 1), i = 0;
 	for (let t = 0; t < r; t += 1) {
 		let n = e.getLineWidth(t);
 		n > i && (i = n);
 	}
 	return i;
-}, Zr = ({ textbox: e, montageLeft: t, montageRight: n }) => {
+}, ti = ({ textbox: e, montageLeft: t, montageRight: n }) => {
 	var r, i, a, o;
 	e.setCoords();
 	let s = e.getBoundingRect(!1, !0), c = (r = s.left) == null ? 0 : r, l = c + ((i = s.width) == null ? 0 : i), u = n - t;
 	if (u > 0 && ((a = s.width) == null ? 0 : a) >= u - .01) return !1;
 	let d = 0;
 	return c < t ? d = t - c : l > n && (d = n - l), Math.abs(d) <= .01 ? !1 : (e.set({ left: ((o = e.left) == null ? 0 : o) + d }), !0);
-}, Qr = ({ rawValue: e, calculatedValue: t }) => typeof e == "number" ? e : typeof t == "number" ? t : 0, $r = ({ stylesList: e }) => {
+}, ni = ({ rawValue: e, calculatedValue: t }) => typeof e == "number" ? e : typeof t == "number" ? t : 0, ri = ({ stylesList: e }) => {
 	let t = e.length;
 	if (!t) return !1;
 	for (let n = 0; n < t; n += 1) {
@@ -6828,16 +7001,16 @@ var Ir = () => {
 		if (r !== void 0 || i !== void 0 || a !== void 0 || o !== void 0 || s !== void 0 || c !== void 0) return !0;
 	}
 	return !1;
-}, ei = ({ textbox: e }) => {
-	let { width: t, height: n, calcTextWidth: r, calcTextHeight: i } = e, a = typeof r == "function" ? r.call(e) : void 0, o = typeof i == "function" ? i.call(e) : void 0, s = Qr({
+}, ii = ({ textbox: e }) => {
+	let { width: t, height: n, calcTextWidth: r, calcTextHeight: i } = e, a = typeof r == "function" ? r.call(e) : void 0, o = typeof i == "function" ? i.call(e) : void 0, s = ni({
 		rawValue: t,
 		calculatedValue: a
-	}), c = Qr({
+	}), c = ni({
 		rawValue: n,
 		calculatedValue: o
 	}), l = Number.isFinite(s) ? Math.round(s) : null, u = Number.isFinite(c) ? Math.round(c) : null, d = {};
 	return l !== null && l !== s && (d.width = Math.max(0, l)), u !== null && u !== c && (d.height = Math.max(0, u)), Object.keys(d).length ? (e.set(d), !0) : !1;
-}, ti = [
+}, ai = [
 	"id",
 	"text",
 	"autoExpand",
@@ -6863,7 +7036,7 @@ var Ir = () => {
 	"radiusTopRight",
 	"radiusBottomRight",
 	"radiusBottomLeft"
-], ni = [
+], oi = [
 	"text",
 	"autoExpand",
 	"fontFamily",
@@ -6888,7 +7061,7 @@ var Ir = () => {
 	"radiusTopRight",
 	"radiusBottomRight",
 	"radiusBottomLeft"
-], ri = class t {
+], si = class t {
 	constructor({ editor: n }) {
 		var r;
 		this._handleTextEditingEntered = (e) => {
@@ -6909,14 +7082,14 @@ var Ir = () => {
 			if (!t._isTextbox(n) || this.lineDefaultsSyncing.has(n)) return;
 			let { text: r = "", uppercase: i, autoExpand: a } = n, o = !!i, s = a !== !1, c = r.toLocaleLowerCase();
 			if (o) {
-				let e = Mr({ value: c });
+				let e = Ir({ value: c });
 				e !== r && n.set({ text: e }), n.textCaseRaw = c;
 			} else n.textCaseRaw = r;
 			a === void 0 && (n.autoExpand = !0);
 			let l = !1;
 			s && (l = this._autoExpandTextboxWidth(n));
 			let u = !1;
-			l || (u = ei({ textbox: n })), (l || u) && (n.setCoords(), n.dirty = !0), this._syncLineFontDefaultsOnTextChanged({ textbox: n });
+			l || (u = ii({ textbox: n })), (l || u) && (n.setCoords(), n.dirty = !0), this._syncLineFontDefaultsOnTextChanged({ textbox: n });
 		}, this._handleTextEditingExited = (e) => {
 			var n, r;
 			let { target: i } = e;
@@ -6927,7 +7100,7 @@ var Ir = () => {
 				var o;
 				i.textCaseRaw = (o = i.textCaseRaw) == null ? a.toLocaleLowerCase() : o;
 			} else i.textCaseRaw = a;
-			ei({ textbox: i }) && (i.setCoords(), i.dirty = !0, this.canvas.requestRenderAll()), i.locked || i.set({
+			ii({ textbox: i }) && (i.setCoords(), i.dirty = !0, this.canvas.requestRenderAll()), i.locked || i.set({
 				lockMovementX: !1,
 				lockMovementY: !1
 			});
@@ -6959,42 +7132,42 @@ var Ir = () => {
 			let { target: g, transform: _ } = n;
 			if (g instanceof e || !t._isTextbox(g) || !_) return;
 			g.isScaling = !0;
-			let v = this._ensureScalingState(g), { baseWidth: y, baseLeft: b, baseFontSize: x, basePadding: S, baseRadii: C, baseStyles: w, baseLineFontDefaults: T } = v, E = typeof ((r = _.original) == null ? void 0 : r.width) == "number" ? _.original.width : void 0, D = typeof ((i = _.original) == null ? void 0 : i.left) == "number" ? _.original.left : void 0, O = E == null ? y : E, k = D == null ? b : D, A = (a = _.corner) == null ? "" : a, j = (o = _.action) == null ? "" : o, M = ["ml", "mr"].includes(A) || j === "scaleX", N = ["mt", "mb"].includes(A) || j === "scaleY", P = [
+			let v = this._ensureScalingState(g), { baseWidth: y, baseLeft: b, baseFontSize: x, basePadding: S, baseRadii: C, baseStyles: w, baseLineFontDefaults: T } = v, E = typeof ((r = _.original) == null ? void 0 : r.width) == "number" ? _.original.width : void 0, D = typeof ((i = _.original) == null ? void 0 : i.left) == "number" ? _.original.left : void 0, O = E == null ? y : E, k = D == null ? b : D, A = (a = _.corner) == null ? "" : a, j = (o = _.action) == null ? "" : o, M = ["ml", "mr"].includes(A) || j === "scaleX", N = ["mt", "mb"].includes(A) || j === "scaleY", ee = [
 				"tl",
 				"tr",
 				"bl",
 				"br"
-			].includes(A) || j === "scale", F = P || N;
-			if (!M && !N && !P) return;
-			let ee = Math.abs((s = (c = g.scaleX) == null ? _.scaleX : c) == null ? 1 : s) || 1, I = Math.abs((l = (u = g.scaleY) == null ? _.scaleY : u) == null ? 1 : l) || 1, L = Math.max(1, O * ee), te = Math.max(1, Math.round(L)), R = Math.max(1, x * I), { paddingTop: z = 0, paddingRight: ne = 0, paddingBottom: re = 0, paddingLeft: ie = 0, radiusTopLeft: B = 0, radiusTopRight: ae = 0, radiusBottomRight: oe = 0, radiusBottomLeft: se = 0, fontSize: V, width: ce, originX: le = "left" } = g, ue = P || N, de = P || N, U = ue ? {
+			].includes(A) || j === "scale", P = ee || N;
+			if (!M && !N && !ee) return;
+			let F = Math.abs((s = (c = g.scaleX) == null ? _.scaleX : c) == null ? 1 : s) || 1, I = Math.abs((l = (u = g.scaleY) == null ? _.scaleY : u) == null ? 1 : l) || 1, L = Math.max(1, O * F), te = Math.max(1, Math.round(L)), R = Math.max(1, x * I), { paddingTop: z = 0, paddingRight: ne = 0, paddingBottom: B = 0, paddingLeft: re = 0, radiusTopLeft: V = 0, radiusTopRight: ie = 0, radiusBottomRight: ae = 0, radiusBottomLeft: oe = 0, fontSize: H, width: se, originX: ce = "left" } = g, le = ee || N, ue = ee || N, W = le ? {
 				top: Math.max(0, S.top * I),
 				right: Math.max(0, S.right * I),
 				bottom: Math.max(0, S.bottom * I),
 				left: Math.max(0, S.left * I)
-			} : S, W = de ? {
+			} : S, de = ue ? {
 				topLeft: Math.max(0, C.topLeft * I),
 				topRight: Math.max(0, C.topRight * I),
 				bottomRight: Math.max(0, C.bottomRight * I),
 				bottomLeft: Math.max(0, C.bottomLeft * I)
 			} : C, fe = Object.keys(w).length > 0, pe;
-			if (F && fe) {
+			if (P && fe) {
 				let e = {};
 				Object.entries(w).forEach(([t, n]) => {
 					if (!n) return;
 					let r = {};
 					Object.entries(n).forEach(([e, t]) => {
 						if (!t) return;
-						let n = H({}, t);
+						let n = U({}, t);
 						typeof t.fontSize == "number" && (n.fontSize = Math.max(1, t.fontSize * I)), r[e] = n;
 					}), Object.keys(r).length && (e[t] = r);
 				}), Object.keys(e).length && (pe = e);
 			}
 			let me;
-			F && (me = Vr({
+			P && (me = Gr({
 				lineFontDefaults: T,
 				scale: I
 			}));
-			let he = (d = (f = _.originX) == null ? le : f) == null ? "left" : d, ge = k + O, _e = k + O / 2, ve = ce == null ? O : ce, ye = te !== ve, be = Math.abs(R - (V == null ? x : V)) > Lr, xe = Math.abs(U.top - z) > .01 || Math.abs(U.right - ne) > .01 || Math.abs(U.bottom - re) > .01 || Math.abs(U.left - ie) > .01, Se = Math.abs(W.topLeft - B) > .01 || Math.abs(W.topRight - ae) > .01 || Math.abs(W.bottomRight - oe) > .01 || Math.abs(W.bottomLeft - se) > .01;
+			let he = (d = (f = _.originX) == null ? ce : f) == null ? "left" : d, ge = k + O, _e = k + O / 2, ve = se == null ? O : se, ye = te !== ve, be = Math.abs(R - (H == null ? x : H)) > Vr, xe = Math.abs(W.top - z) > .01 || Math.abs(W.right - ne) > .01 || Math.abs(W.bottom - B) > .01 || Math.abs(W.left - re) > .01, Se = Math.abs(de.topLeft - V) > .01 || Math.abs(de.topRight - ie) > .01 || Math.abs(de.bottomRight - ae) > .01 || Math.abs(de.bottomLeft - oe) > .01;
 			if (!ye && !be && !xe && !Se) {
 				g.set({
 					scaleX: 1,
@@ -7004,33 +7177,33 @@ var Ir = () => {
 			}
 			pe && (g.styles = pe), me && (g.lineFontDefaults = me), g.set({
 				width: te,
-				fontSize: F ? R : x,
-				paddingTop: U.top,
-				paddingRight: U.right,
-				paddingBottom: U.bottom,
-				paddingLeft: U.left,
-				radiusTopLeft: W.topLeft,
-				radiusTopRight: W.topRight,
-				radiusBottomRight: W.bottomRight,
-				radiusBottomLeft: W.bottomLeft,
+				fontSize: P ? R : x,
+				paddingTop: W.top,
+				paddingRight: W.right,
+				paddingBottom: W.bottom,
+				paddingLeft: W.left,
+				radiusTopLeft: de.topLeft,
+				radiusTopRight: de.topRight,
+				radiusBottomRight: de.bottomRight,
+				radiusBottomLeft: de.bottomLeft,
 				scaleX: 1,
 				scaleY: 1
 			});
-			let Ce = ei({ textbox: g });
+			let Ce = ii({ textbox: g });
 			Ce && (g.dirty = !0);
 			let we = (p = g.width) == null ? te : p, Te = we !== ve, Ee = k;
-			Te && (M || P) && (he === "right" ? Ee = ge - we : he === "center" && (Ee = _e - we / 2)), g.set({ left: Ee }), v.baseLeft = Ee, _.scaleX = 1, _.scaleY = 1;
+			Te && (M || ee) && (he === "right" ? Ee = ge - we : he === "center" && (Ee = _e - we / 2)), g.set({ left: Ee }), v.baseLeft = Ee, _.scaleX = 1, _.scaleY = 1;
 			let { original: De } = _;
-			De && (De.scaleX = 1, De.scaleY = 1, De.width = we, De.height = g.height, De.left = Ee), g.setCoords(), this.canvas.requestRenderAll(), v.baseWidth = we, v.baseFontSize = (m = g.fontSize) == null ? R : m, v.baseStyles = JSON.parse(JSON.stringify((h = g.styles) == null ? {} : h)), v.baseLineFontDefaults = Br({ lineFontDefaults: g.lineFontDefaults }), v.basePadding = {
-				top: U.top,
-				right: U.right,
-				bottom: U.bottom,
-				left: U.left
+			De && (De.scaleX = 1, De.scaleY = 1, De.width = we, De.height = g.height, De.left = Ee), g.setCoords(), this.canvas.requestRenderAll(), v.baseWidth = we, v.baseFontSize = (m = g.fontSize) == null ? R : m, v.baseStyles = JSON.parse(JSON.stringify((h = g.styles) == null ? {} : h)), v.baseLineFontDefaults = Wr({ lineFontDefaults: g.lineFontDefaults }), v.basePadding = {
+				top: W.top,
+				right: W.right,
+				bottom: W.bottom,
+				left: W.left
 			}, v.baseRadii = {
-				topLeft: W.topLeft,
-				topRight: W.topRight,
-				bottomRight: W.bottomRight,
-				bottomLeft: W.bottomLeft
+				topLeft: de.topLeft,
+				topRight: de.topRight,
+				bottomRight: de.bottomRight,
+				bottomLeft: de.bottomLeft
 			}, v.hasWidthChange = Te || be || xe || Se || Ce;
 		}, this._handleObjectModified = (n) => {
 			var r, i, a;
@@ -7059,16 +7232,16 @@ var Ir = () => {
 								typeof e.fontSize == "number" && (e.fontSize = Math.max(1, e.fontSize * l));
 							});
 						}));
-						let S = Vr({
+						let S = Gr({
 							lineFontDefaults: e.lineFontDefaults,
 							scale: l
-						}), C = H(H(H({
+						}), C = U(U(U({
 							fontSize: s,
 							width: c,
 							scaleX: 1,
 							scaleY: 1
 						}, y), b), {}, { styles: x });
-						S && (C.lineFontDefaults = S), e.set(C), ei({ textbox: e });
+						S && (C.lineFontDefaults = S), e.set(C), ii({ textbox: e });
 					}
 					e.setCoords();
 				});
@@ -7098,18 +7271,18 @@ var Ir = () => {
 				scaleX: 1,
 				scaleY: 1
 			}), o.setCoords();
-		}, this.editor = n, this.canvas = n.canvas, this.fonts = (r = n.options.fonts) == null ? [] : r, this.scalingState = /* @__PURE__ */ new WeakMap(), this.editingAnchorState = /* @__PURE__ */ new WeakMap(), this.lineDefaultsSyncing = /* @__PURE__ */ new WeakSet(), this.isTextEditingActive = !1, this._bindEvents(), Ir();
+		}, this.editor = n, this.canvas = n.canvas, this.fonts = (r = n.options.fonts) == null ? [] : r, this.scalingState = /* @__PURE__ */ new WeakMap(), this.editingAnchorState = /* @__PURE__ */ new WeakMap(), this.lineDefaultsSyncing = /* @__PURE__ */ new WeakSet(), this.isTextEditingActive = !1, this._bindEvents(), Br();
 	}
 	addText(e = {}, { withoutSelection: t = !1, withoutSave: n = !1, withoutAdding: r = !1 } = {}) {
 		var i;
-		let { id: a = `text-${D()}`, text: o = "Новый текст", autoExpand: s = !0, fontFamily: c, fontSize: l = 48, bold: u = !1, italic: d = !1, underline: f = !1, uppercase: p = !1, strikethrough: m = !1, align: h = "left", color: g = "#000000", strokeColor: _, strokeWidth: v = 0, opacity: y = 1, backgroundColor: b, backgroundOpacity: x = 1, paddingTop: S = 0, paddingRight: C = 0, paddingBottom: w = 0, paddingLeft: T = 0, radiusTopLeft: E = 0, radiusTopRight: O = 0, radiusBottomRight: k = 0, radiusBottomLeft: A = 0 } = e, j = ut(e, ti), { historyManager: M } = this.editor, { canvas: N } = this;
+		let { id: a = `text-${D()}`, text: o = "Новый текст", autoExpand: s = !0, fontFamily: c, fontSize: l = 48, bold: u = !1, italic: d = !1, underline: f = !1, uppercase: p = !1, strikethrough: m = !1, align: h = "left", color: g = "#000000", strokeColor: _, strokeWidth: v = 0, opacity: y = 1, backgroundColor: b, backgroundOpacity: x = 1, paddingTop: S = 0, paddingRight: C = 0, paddingBottom: w = 0, paddingLeft: T = 0, radiusTopLeft: E = 0, radiusTopRight: O = 0, radiusBottomRight: k = 0, radiusBottomLeft: A = 0 } = e, j = ut(e, ai), { historyManager: M } = this.editor, { canvas: N } = this;
 		M.suspendHistory();
-		let P = c == null ? this._getDefaultFontFamily() : c, F = jr({ width: v }), ee = Ar({
+		let ee = c == null ? this._getDefaultFontFamily() : c, P = Fr({ width: v }), F = Pr({
 			strokeColor: _,
-			width: F
-		}), I = H({
+			width: P
+		}), I = U({
 			id: a,
-			fontFamily: P,
+			fontFamily: ee,
 			fontSize: l,
 			fontWeight: u ? "bold" : "normal",
 			fontStyle: d ? "italic" : "normal",
@@ -7118,8 +7291,8 @@ var Ir = () => {
 			linethrough: m,
 			textAlign: h,
 			fill: g,
-			stroke: ee,
-			strokeWidth: F,
+			stroke: F,
+			strokeWidth: P,
 			strokeUniform: !0,
 			opacity: y,
 			backgroundColor: b,
@@ -7132,22 +7305,22 @@ var Ir = () => {
 			radiusTopRight: O,
 			radiusBottomRight: k,
 			radiusBottomLeft: A
-		}, j), L = new Fr(o, I);
+		}, j), L = new zr(o, I);
 		if (L.autoExpand = s !== !1, L.textCaseRaw = (i = L.text) == null ? "" : i, p) {
-			let e = Mr({ value: L.textCaseRaw });
+			let e = Ir({ value: L.textCaseRaw });
 			e !== L.text && L.set({ text: e });
 		}
-		return ei({ textbox: L }) && (L.dirty = !0), j.left === void 0 && j.top === void 0 && N.centerObject(L), r || N.add(L), t || N.setActiveObject(L), N.requestRenderAll(), M.resumeHistory(), n || M.saveState(), N.fire("editor:text-added", {
+		return ii({ textbox: L }) && (L.dirty = !0), j.left === void 0 && j.top === void 0 && N.centerObject(L), r || N.add(L), t || N.setActiveObject(L), N.requestRenderAll(), M.resumeHistory(), n || M.saveState(), N.fire("editor:text-added", {
 			textbox: L,
-			options: H(H({}, I), {}, {
+			options: U(U({}, I), {}, {
 				text: o,
 				bold: u,
 				italic: d,
 				strikethrough: m,
 				align: h,
 				color: g,
-				strokeColor: ee,
-				strokeWidth: F
+				strokeColor: F,
+				strokeWidth: P
 			}),
 			flags: {
 				withoutSelection: !!t,
@@ -7166,116 +7339,116 @@ var Ir = () => {
 			originY: p,
 			x: m.x,
 			y: m.y
-		}, { text: g, autoExpand: _, fontFamily: v, fontSize: y, bold: b, italic: x, underline: S, uppercase: C, strikethrough: w, align: T, color: E, strokeColor: D, strokeWidth: O, opacity: k, backgroundColor: A, backgroundOpacity: j, paddingTop: M, paddingRight: N, paddingBottom: P, paddingLeft: F, radiusTopLeft: ee, radiusTopRight: I, radiusBottomRight: L, radiusBottomLeft: te } = n, R = H({}, ut(n, ni)), z = a === void 0 ? Tr({ textbox: c }) : Ur({
+		}, { text: g, autoExpand: _, fontFamily: v, fontSize: y, bold: b, italic: x, underline: S, uppercase: C, strikethrough: w, align: T, color: E, strokeColor: D, strokeWidth: O, opacity: k, backgroundColor: A, backgroundOpacity: j, paddingTop: M, paddingRight: N, paddingBottom: ee, paddingLeft: P, radiusTopLeft: F, radiusTopRight: I, radiusBottomRight: L, radiusBottomLeft: te } = n, R = U({}, ut(n, oi)), z = a === void 0 ? kr({ textbox: c }) : qr({
 			text: l,
 			range: a
-		}), ne = z ? Wr({
+		}), ne = z ? Jr({
 			textbox: c,
 			range: z
-		}) : null, re = {}, ie = {}, B = {}, ae, oe, se = Dr({
+		}) : null, B = {}, re = {}, V = {}, ie, ae, oe = jr({
 			textbox: c,
 			range: z
-		}), V = !z || se, ce = !z;
-		if (v !== void 0 && (ne && (ie.fontFamily = v), V && (R.fontFamily = v, ce && (B.fontFamily = v))), y !== void 0 && (ne && (ie.fontSize = y), V && (R.fontSize = y, ce && (B.fontSize = y))), b !== void 0) {
+		}), H = !z || oe, se = !z;
+		if (v !== void 0 && (ne && (re.fontFamily = v), H && (R.fontFamily = v, se && (V.fontFamily = v))), y !== void 0 && (ne && (re.fontSize = y), H && (R.fontSize = y, se && (V.fontSize = y))), b !== void 0) {
 			let e = b ? "bold" : "normal";
-			z && (re.fontWeight = e), V && (R.fontWeight = e, ce && (B.fontWeight = e));
+			z && (B.fontWeight = e), H && (R.fontWeight = e, se && (V.fontWeight = e));
 		}
 		if (x !== void 0) {
 			let e = x ? "italic" : "normal";
-			z && (re.fontStyle = e), V && (R.fontStyle = e, ce && (B.fontStyle = e));
+			z && (B.fontStyle = e), H && (R.fontStyle = e, se && (V.fontStyle = e));
 		}
-		if (S !== void 0 && (z && (re.underline = S), V && (R.underline = S, ce && (B.underline = S))), w !== void 0 && (z && (re.linethrough = w), V && (R.linethrough = w, ce && (B.linethrough = w))), T !== void 0 && (R.textAlign = T), E !== void 0 && (z && (re.fill = E), V && (R.fill = E, ce && (B.fill = E))), D !== void 0 || O !== void 0) {
-			var le, ue, de, U;
-			let e = z ? kr({
+		if (S !== void 0 && (z && (B.underline = S), H && (R.underline = S, se && (V.underline = S))), w !== void 0 && (z && (B.linethrough = w), H && (R.linethrough = w, se && (V.linethrough = w))), T !== void 0 && (R.textAlign = T), E !== void 0 && (z && (B.fill = E), H && (R.fill = E, se && (V.fill = E))), D !== void 0 || O !== void 0) {
+			var ce, le, ue, W;
+			let e = z ? Nr({
 				textbox: c,
 				range: z,
 				property: "strokeWidth"
-			}) : void 0, t = z ? kr({
+			}) : void 0, t = z ? Nr({
 				textbox: c,
 				range: z,
 				property: "stroke"
 			}) : void 0;
-			oe = jr({ width: (le = (ue = O == null ? e : O) == null ? c.strokeWidth : ue) == null ? 0 : le }), ae = Ar({
-				strokeColor: (de = (U = D == null ? t : D) == null ? c.stroke : U) == null ? void 0 : de,
-				width: oe
-			}), z && (re.stroke = ae, re.strokeWidth = oe), V && (R.stroke = ae, R.strokeWidth = oe, ce && (B.stroke = ae, B.strokeWidth = oe));
-		}
-		k !== void 0 && (R.opacity = k), A !== void 0 && (R.backgroundColor = A), j !== void 0 && (R.backgroundOpacity = j), M !== void 0 && (R.paddingTop = M), N !== void 0 && (R.paddingRight = N), P !== void 0 && (R.paddingBottom = P), F !== void 0 && (R.paddingLeft = F), ee !== void 0 && (R.radiusTopLeft = ee), I !== void 0 && (R.radiusTopRight = I), L !== void 0 && (R.radiusBottomRight = L), te !== void 0 && (R.radiusBottomLeft = te);
-		let W = (s = c.textCaseRaw) == null ? l : s, fe = !!c.uppercase, pe = g !== void 0, me = pe ? g == null ? "" : g : W, he = C == null ? fe : C, ge = he !== fe;
-		pe || ge ? (R.text = he ? Mr({ value: me }) : me, c.textCaseRaw = me) : c.textCaseRaw === void 0 && (c.textCaseRaw = W), c.uppercase = he, c.set(R);
+			ae = Fr({ width: (ce = (le = O == null ? e : O) == null ? c.strokeWidth : le) == null ? 0 : ce }), ie = Pr({
+				strokeColor: (ue = (W = D == null ? t : D) == null ? c.stroke : W) == null ? void 0 : ue,
+				width: ae
+			}), z && (B.stroke = ie, B.strokeWidth = ae), H && (R.stroke = ie, R.strokeWidth = ae, se && (V.stroke = ie, V.strokeWidth = ae));
+		}
+		k !== void 0 && (R.opacity = k), A !== void 0 && (R.backgroundColor = A), j !== void 0 && (R.backgroundOpacity = j), M !== void 0 && (R.paddingTop = M), N !== void 0 && (R.paddingRight = N), ee !== void 0 && (R.paddingBottom = ee), P !== void 0 && (R.paddingLeft = P), F !== void 0 && (R.radiusTopLeft = F), I !== void 0 && (R.radiusTopRight = I), L !== void 0 && (R.radiusBottomRight = L), te !== void 0 && (R.radiusBottomLeft = te);
+		let de = (s = c.textCaseRaw) == null ? l : s, fe = !!c.uppercase, pe = g !== void 0, me = pe ? g == null ? "" : g : de, he = C == null ? fe : C, ge = he !== fe;
+		pe || ge ? (R.text = he ? Ir({ value: me }) : me, c.textCaseRaw = me) : c.textCaseRaw === void 0 && (c.textCaseRaw = de), c.uppercase = he, c.set(R);
 		let _e = !1;
 		if (z) {
-			let e = Or({
+			let e = Mr({
 				textbox: c,
-				styles: re,
+				styles: B,
 				range: z
-			}), t = ne ? Or({
+			}), t = ne ? Mr({
 				textbox: c,
-				styles: ie,
+				styles: re,
 				range: ne
 			}) : !1;
 			_e = e || t;
-		} else if (Object.keys(B).length) {
-			let e = Er({ textbox: c });
-			e && (_e = Or({
+		} else if (Object.keys(V).length) {
+			let e = Ar({ textbox: c });
+			e && (_e = Mr({
 				textbox: c,
-				styles: B,
+				styles: V,
 				range: e
 			}));
 		}
-		let ve = _e && $r({ stylesList: [
+		let ve = _e && ri({ stylesList: [
+			B,
 			re,
-			ie,
-			B
+			V
 		] });
 		if (_e && (c.dirty = !0), ne && (v !== void 0 || y !== void 0)) {
-			let e = Gr({
+			let e = Yr({
 				textbox: c,
 				range: ne
 			}), t = {};
-			v !== void 0 && (t.fontFamily = v), y !== void 0 && (t.fontSize = y), Rr({
+			v !== void 0 && (t.fontFamily = v), y !== void 0 && (t.fontSize = y), Hr({
 				textbox: c,
 				lineIndices: e,
 				updates: t
 			});
 		}
 		if (z && (E !== void 0 || D !== void 0 || O !== void 0)) {
-			let e = Kr({
+			let e = Xr({
 				textbox: c,
 				range: z
 			}), t = {};
-			E !== void 0 && (t.fill = E), (D !== void 0 || O !== void 0) && (ae === null && (t.stroke = null), ae != null && (t.stroke = ae)), Rr({
+			E !== void 0 && (t.fill = E), (D !== void 0 || O !== void 0) && (ie === null && (t.stroke = null), ie != null && (t.stroke = ie)), Hr({
 				textbox: c,
 				lineIndices: e,
 				updates: t
 			});
 		}
-		ve && (c.initDimensions(), c.dirty = !0), (A !== void 0 || j !== void 0 || M !== void 0 || N !== void 0 || P !== void 0 || F !== void 0 || ee !== void 0 || I !== void 0 || L !== void 0 || te !== void 0) && (c.dirty = !0);
-		let ye = $r({ stylesList: [
+		ve && (c.initDimensions(), c.dirty = !0), (A !== void 0 || j !== void 0 || M !== void 0 || N !== void 0 || ee !== void 0 || P !== void 0 || F !== void 0 || I !== void 0 || L !== void 0 || te !== void 0) && (c.dirty = !0);
+		let ye = ri({ stylesList: [
 			R,
+			B,
 			re,
-			ie,
-			B
+			V
 		] }), { autoExpand: be } = c, xe = _ !== void 0, Se = (_ == null ? be : _) !== !1;
 		xe ? c.autoExpand = _ !== !1 : be === void 0 && (c.autoExpand = !0);
 		let Ce = Object.prototype.hasOwnProperty.call(R, "width"), we = Se && !Ce && (pe || ge || ye), Te = !1;
-		we && (Te = this._autoExpandTextboxWidth(c, { anchor: h }), Te && (c.dirty = !0)), !Te && ei({ textbox: c }) && (c.dirty = !0), c.setCoords();
+		we && (Te = this._autoExpandTextboxWidth(c, { anchor: h }), Te && (c.dirty = !0)), !Te && ii({ textbox: c }) && (c.dirty = !0), c.setCoords();
 		let Ee = {
 			withoutSave: !!r,
 			skipRender: !!i
-		}, De = !!z && Object.keys(re).length > 0, Oe = {
+		}, De = !!z && Object.keys(B).length > 0, Oe = {
 			textbox: c,
 			target: e,
 			style: n,
 			options: Ee,
 			updates: R,
 			selectionRange: z == null ? void 0 : z,
-			selectionStyles: De ? re : void 0
+			selectionStyles: De ? B : void 0
 		};
 		d.fire("editor:before:text-updated", Oe), i || d.requestRenderAll();
 		let ke = t._getSnapshot(c);
 		u.resumeHistory(), r || u.saveState();
-		let Ae = H(H({}, Oe), {}, {
+		let Ae = U(U({}, Oe), {}, {
 			before: f,
 			after: ke
 		});
@@ -7312,15 +7485,15 @@ var Ir = () => {
 		var t;
 		let { text: n = "", lineFontDefaults: r, styles: i, fontFamily: a, fontSize: o, fill: s, stroke: c, selectionStart: l, isEditing: u } = e, d = n, f = (t = e.__lineDefaultsPrevText) == null ? d : t, p = f.split("\n"), m = d.split("\n"), h = p.length, g = m.length - h, _ = r, v = !1, y = !1, b = typeof s == "string" ? s : void 0, x = typeof c == "string" ? c : void 0;
 		if (g !== 0 && r && Object.keys(r).length) {
-			let e = qr({
+			let e = Zr({
 				previous: f,
 				next: d
-			}), t = Jr({
+			}), t = Qr({
 				text: f,
 				charIndex: e
 			});
 			if (g > 0) {
-				let n = Yr({
+				let n = $r({
 					text: f,
 					lineIndex: t
 				}), i = t + 1;
@@ -7333,7 +7506,7 @@ var Ir = () => {
 					let n = r[t];
 					if (!n) continue;
 					let o = t >= i ? t + g : t;
-					a[o] = H({}, n);
+					a[o] = U({}, n);
 				}
 				_ = a, v = !0, y = !0;
 			}
@@ -7349,7 +7522,7 @@ var Ir = () => {
 					let t = Number(e);
 					if (!Number.isFinite(t)) continue;
 					let n = r[t];
-					n && (t < i && (o[t] = H({}, n)), t > a && (o[t + g] = H({}, n)));
+					n && (t < i && (o[t] = U({}, n)), t > a && (o[t + g] = U({}, n)));
 				}
 				_ = o, v = !0, y = !0;
 			}
@@ -7365,21 +7538,21 @@ var Ir = () => {
 			let t = (k = m[e]) == null ? "" : k, n = _ ? _[e] : void 0;
 			if (n && (D = n), t.length !== 0) {
 				if (n) {
-					let r = zr({
+					let r = Ur({
 						lineText: t,
 						lineStyles: w ? w[e] : void 0,
 						lineDefaults: n
 					});
-					r.changed && (w || (w = {}, E = !0), E || (w = H({}, w), E = !0), r.lineStyles && (w[e] = r.lineStyles), !r.lineStyles && w[e] && delete w[e], T = !0);
+					r.changed && (w || (w = {}, E = !0), E || (w = U({}, w), E = !0), r.lineStyles && (w[e] = r.lineStyles), !r.lineStyles && w[e] && delete w[e], T = !0);
 				}
 				continue;
 			}
 			let r = n == null ? D : n, i = {};
-			(r == null ? void 0 : r.fontFamily) === void 0 ? a !== void 0 && (i.fontFamily = a) : i.fontFamily = r.fontFamily, (r == null ? void 0 : r.fontSize) === void 0 ? o !== void 0 && (i.fontSize = o) : i.fontSize = r.fontSize, (r == null ? void 0 : r.fill) === void 0 ? b !== void 0 && (i.fill = b) : i.fill = r.fill, (r == null ? void 0 : r.stroke) === void 0 ? x !== void 0 && (i.stroke = x) : i.stroke = r.stroke, !n && Object.keys(i).length && (_ || (_ = {}, y = !0), y || (_ = H({}, _), y = !0), _[e] = i, v = !0, D = i), n && (D = n), C !== null && C === e && (O = i);
+			(r == null ? void 0 : r.fontFamily) === void 0 ? a !== void 0 && (i.fontFamily = a) : i.fontFamily = r.fontFamily, (r == null ? void 0 : r.fontSize) === void 0 ? o !== void 0 && (i.fontSize = o) : i.fontSize = r.fontSize, (r == null ? void 0 : r.fill) === void 0 ? b !== void 0 && (i.fill = b) : i.fill = r.fill, (r == null ? void 0 : r.stroke) === void 0 ? x !== void 0 && (i.stroke = x) : i.stroke = r.stroke, !n && Object.keys(i).length && (_ || (_ = {}, y = !0), y || (_ = U({}, _), y = !0), _[e] = i, v = !0, D = i), n && (D = n), C !== null && C === e && (O = i);
 			let s = {};
 			i.fontFamily !== void 0 && (s.fontFamily = i.fontFamily), i.fontSize !== void 0 && (s.fontSize = i.fontSize), i.fill !== void 0 && (s.fill = i.fill), i.stroke !== void 0 && (s.stroke = i.stroke);
 			let c = Object.keys(s).length > 0;
-			(c || w && w[e]) && (w || (w = {}, E = !0), E || (w = H({}, w), E = !0), c && (w[e] = { 0: s }), !c && w[e] && delete w[e], T = !0);
+			(c || w && w[e]) && (w || (w = {}, E = !0), E || (w = U({}, w), E = !0), c && (w[e] = { 0: s }), !c && w[e] && delete w[e], T = !0);
 		}
 		if (v && _ && (e.lineFontDefaults = _), T && (e.styles = w, e.dirty = !0), O && typeof l == "number") {
 			let t = {};
@@ -7407,17 +7580,17 @@ var Ir = () => {
 		if (!Number.isFinite(E) || E <= 0) return !1;
 		let D = _.split("\n").length, O = !1;
 		Math.abs(((u = e.width) == null ? 0 : u) - E) > .01 && (e.set({ width: E }), O = !0), e.initDimensions();
-		let { textLines: k } = e, A = Array.isArray(k) && k.length > D, j = Math.ceil(Xr({
+		let { textLines: k } = e, A = Array.isArray(k) && k.length > D, j = Math.ceil(ei({
 			textbox: e,
 			text: _
 		})), M = Math.min((d = e.minWidth) == null ? 1 : d, E), N = Math.min(E, Math.max(j, M));
-		A && (N = E), Math.abs(((f = e.width) == null ? 0 : f) - N) > .01 && (e.set({ width: N }), e.initDimensions(), O = !0), ei({ textbox: e }) && (O = !0), b && (e.setPositionByOrigin(new p(b.x, b.y), "center", x), O = !0);
-		let P = Zr({
+		A && (N = E), Math.abs(((f = e.width) == null ? 0 : f) - N) > .01 && (e.set({ width: N }), e.initDimensions(), O = !0), ii({ textbox: e }) && (O = !0), b && (e.setPositionByOrigin(new p(b.x, b.y), "center", x), O = !0);
+		let ee = ti({
 			textbox: e,
 			montageLeft: (m = v.left) == null ? 0 : m,
 			montageRight: ((h = v.left) == null ? 0 : h) + y
 		});
-		return O || P;
+		return O || ee;
 	}
 	_ensureEditingAnchorState() {
 		return this.editingAnchorState || (this.editingAnchorState = /* @__PURE__ */ new WeakMap()), this.editingAnchorState;
@@ -7444,7 +7617,7 @@ var Ir = () => {
 					bottomLeft: _
 				},
 				baseStyles: JSON.parse(JSON.stringify(c)),
-				baseLineFontDefaults: Br({ lineFontDefaults: l }),
+				baseLineFontDefaults: Wr({ lineFontDefaults: l }),
 				hasWidthChange: !1
 			}, this.scalingState.set(e, t);
 		}
@@ -7455,13 +7628,13 @@ var Ir = () => {
 			Object.entries(t).forEach(([t, n]) => {
 				n != null && (e[t] = n);
 			});
-		}, { id: n, text: r, textCaseRaw: i, uppercase: a, autoExpand: o, fontFamily: s, fontSize: c, fontWeight: l, fontStyle: u, underline: d, linethrough: f, textAlign: p, fill: m, stroke: h, strokeWidth: g, opacity: _, backgroundColor: v, backgroundOpacity: y, paddingTop: b, paddingRight: x, paddingBottom: S, paddingLeft: C, radiusTopLeft: w, radiusTopRight: T, radiusBottomRight: E, radiusBottomLeft: D, left: O, top: k, width: A, height: j, angle: M, scaleX: N, scaleY: P } = e, F = {
+		}, { id: n, text: r, textCaseRaw: i, uppercase: a, autoExpand: o, fontFamily: s, fontSize: c, fontWeight: l, fontStyle: u, underline: d, linethrough: f, textAlign: p, fill: m, stroke: h, strokeWidth: g, opacity: _, backgroundColor: v, backgroundOpacity: y, paddingTop: b, paddingRight: x, paddingBottom: S, paddingLeft: C, radiusTopLeft: w, radiusTopRight: T, radiusBottomRight: E, radiusBottomLeft: D, left: O, top: k, width: A, height: j, angle: M, scaleX: N, scaleY: ee } = e, P = {
 			id: n,
 			uppercase: !!a,
 			textAlign: p
 		};
 		return t({
-			snapshot: F,
+			snapshot: P,
 			entries: {
 				text: r,
 				textCaseRaw: i,
@@ -7492,15 +7665,15 @@ var Ir = () => {
 				height: j,
 				angle: M,
 				scaleX: N,
-				scaleY: P
+				scaleY: ee
 			}
-		}), F;
+		}), P;
 	}
 	_getDefaultFontFamily() {
 		var e, t;
 		return (e = (t = this.fonts[0]) == null ? void 0 : t.family) == null ? "Arial" : e;
 	}
-}, ii = ({ x1: e, y1: t, x2: n, y2: r }) => (Math.atan2(r - t, n - e) * 180 / Math.PI + 360) % 360, ai = (e) => {
+}, ci = ({ x1: e, y1: t, x2: n, y2: r }) => (Math.atan2(r - t, n - e) * 180 / Math.PI + 360) % 360, li = (e) => {
 	if (!e || typeof e != "object") return null;
 	let { type: t, coords: n, colorStops: r } = e, i = Array.isArray(r) ? r : [], a = i[0], o = i[i.length - 1], s = typeof (a == null ? void 0 : a.color) == "string" ? a.color : void 0, c = typeof (o == null ? void 0 : o.color) == "string" ? o.color : s, l = typeof (a == null ? void 0 : a.offset) == "number" ? a.offset * 100 : void 0, u = typeof (o == null ? void 0 : o.offset) == "number" ? o.offset * 100 : void 0, d = i.map((e) => ({
 		color: typeof e.color == "string" ? e.color : "#000000",
@@ -7511,7 +7684,7 @@ var Ir = () => {
 		let { x1: e, y1: t, x2: r, y2: i } = n;
 		if (typeof e == "number" && typeof t == "number" && typeof r == "number" && typeof i == "number") return {
 			type: "linear",
-			angle: ii({
+			angle: ci({
 				x1: e,
 				y1: t,
 				x2: r,
@@ -7539,7 +7712,7 @@ var Ir = () => {
 		};
 	}
 	return null;
-}, oi = ["baseWidth", "baseHeight"], si = "_templateCenterX", ci = "_templateCenterY", li = "_templateAnchorX", ui = "_templateAnchorY", di = class t {
+}, ui = ["baseWidth", "baseHeight"], di = "_templateCenterX", fi = "_templateCenterY", pi = "_templateAnchorX", mi = "_templateAnchorY", hi = class t {
 	constructor({ editor: e }) {
 		this.editor = e;
 	}
@@ -7548,7 +7721,7 @@ var Ir = () => {
 		if (!p.length) return s.emitWarning({
 			origin: "TemplateManager",
 			method: "serializeSelection",
-			code: Sr.TEMPLATE_MANAGER.NO_OBJECTS_SELECTED,
+			code: Er.TEMPLATE_MANAGER.NO_OBJECTS_SELECTED,
 			message: "Нет объектов для сериализации шаблона"
 		}), null;
 		let m = t._getBounds(o), h = t._getMontageSize({
@@ -7560,7 +7733,7 @@ var Ir = () => {
 			baseWidth: g,
 			baseHeight: _,
 			montageArea: o == null ? null : o
-		})), y = H(H({}, r), {}, {
+		})), y = U(U({}, r), {}, {
 			baseWidth: g,
 			baseHeight: _,
 			positionsNormalized: !0,
@@ -7579,14 +7752,14 @@ var Ir = () => {
 			if (!(c != null && c.length)) return o.emitWarning({
 				origin: "TemplateManager",
 				method: "applyTemplate",
-				code: Sr.TEMPLATE_MANAGER.INVALID_TEMPLATE,
+				code: Er.TEMPLATE_MANAGER.INVALID_TEMPLATE,
 				message: "Шаблон не содержит объектов"
 			}), null;
 			let d = t._getBounds(i);
 			if (!d) return o.emitWarning({
 				origin: "TemplateManager",
 				method: "applyTemplate",
-				code: Sr.TEMPLATE_MANAGER.INVALID_TARGET,
+				code: Er.TEMPLATE_MANAGER.INVALID_TARGET,
 				message: "Не удалось определить границы монтажной области"
 			}), null;
 			let f = t._getMontageSize({
@@ -7605,7 +7778,7 @@ var Ir = () => {
 				if (!a.length) return o.emitWarning({
 					origin: "TemplateManager",
 					method: "applyTemplate",
-					code: Sr.TEMPLATE_MANAGER.INVALID_TEMPLATE,
+					code: Er.TEMPLATE_MANAGER.INVALID_TEMPLATE,
 					message: "Не удалось создать объекты шаблона"
 				}), null;
 				let { backgroundObject: l, contentObjects: u } = t._extractBackgroundObject(a);
@@ -7642,7 +7815,7 @@ var Ir = () => {
 				return o.emitError({
 					origin: "TemplateManager",
 					method: "applyTemplate",
-					code: Sr.TEMPLATE_MANAGER.APPLY_FAILED,
+					code: Er.TEMPLATE_MANAGER.APPLY_FAILED,
 					message: "Ошибка применения шаблона",
 					data: {
 						templateId: u,
@@ -7758,7 +7931,7 @@ var Ir = () => {
 		})();
 	}
 	static _prepareSerializableProps(e) {
-		let t = H({}, e);
+		let t = U({}, e);
 		return delete t.svgMarkup, delete t.objects, delete t.path, delete t.paths, delete t.type, delete t.version, t;
 	}
 	static _isSvgObject(e) {
@@ -7792,8 +7965,8 @@ var Ir = () => {
 			baseHeight: o,
 			useRelativePositions: c,
 			centerKeys: {
-				x: si,
-				y: ci
+				x: di,
+				y: fi
 			}
 		}), { scaleX: f, scaleY: p } = e, m = G({
 			value: f,
@@ -7810,8 +7983,8 @@ var Ir = () => {
 				baseHeight: o,
 				scale: n,
 				useRelativePositions: c,
-				anchorX: t._resolveAnchor(l, li),
-				anchorY: t._resolveAnchor(l, ui)
+				anchorX: t._resolveAnchor(l, pi),
+				anchorY: t._resolveAnchor(l, mi)
 			}),
 			targetSize: i,
 			montageArea: s
@@ -7819,7 +7992,7 @@ var Ir = () => {
 		e.set({
 			scaleX: _,
 			scaleY: v
-		}), e.setPositionByOrigin(g, "center", "center"), e.setCoords(), delete l[si], delete l[ci], delete l[li], delete l[ui];
+		}), e.setPositionByOrigin(g, "center", "center"), e.setCoords(), delete l[di], delete l[fi], delete l[pi], delete l[mi];
 	}
 	static _getPositioningBounds({ bounds: e, baseWidth: n, baseHeight: r, scale: i, useRelativePositions: a, anchorX: o, anchorY: s }) {
 		if (!a) return e;
@@ -7847,8 +8020,8 @@ var Ir = () => {
 		return Math.abs(u) <= .1 ? "center" : u < 0 ? "start" : "end";
 	}
 	static _normalizeMeta({ meta: e, fallback: t }) {
-		let { width: n, height: r } = t, i = e || {}, { baseWidth: a = n, baseHeight: o = r } = i, s = ut(i, oi);
-		return H({
+		let { width: n, height: r } = t, i = e || {}, { baseWidth: a = n, baseHeight: o = r } = i, s = ut(i, ui);
+		return U({
 			baseWidth: a,
 			baseHeight: o
 		}, s);
@@ -7895,7 +8068,7 @@ var Ir = () => {
 		}), g = h * p, v = d * p, y = f * p, b = g + v + y + m;
 		if (!a || !h || !l) return;
 		e.setCoords();
-		let x = e, S = x[si], C = typeof S == "number" ? S : null, w = t._resolveAnchor(x, li), T = b / l, E = C === null ? null : C - T / 2, D = C === null ? null : C + T / 2, O = e.getCenterPoint();
+		let x = e, S = x[di], C = typeof S == "number" ? S : null, w = t._resolveAnchor(x, pi), T = b / l, E = C === null ? null : C - T / 2, D = C === null ? null : C + T / 2, O = e.getCenterPoint();
 		e.set("width", a), e.initDimensions();
 		let k = t._getLongestLineWidth({
 			textbox: e,
@@ -7903,7 +8076,7 @@ var Ir = () => {
 		}), A = k > h ? k + 1 : h;
 		e.set("width", A), e.initDimensions(), e.setPositionByOrigin(O, "center", "center"), e.setCoords();
 		let j = (A * p + v + y + m) / l, M = C;
-		w === "start" && E !== null ? M = Math.max(0, E) + j / 2 : w === "end" && D !== null && (M = Math.min(1, D) - j / 2), typeof M == "number" && (x[si] = M);
+		w === "start" && E !== null ? M = Math.max(0, E) + j / 2 : w === "end" && D !== null && (M = Math.min(1, D) - j / 2), typeof M == "number" && (x[di] = M);
 	}
 	static _getLongestLineWidth({ textbox: e, text: t }) {
 		let { textLines: n } = e, r = Array.isArray(n) && n.length > 0 ? n.length : Math.max(t.split("\n").length, 1), i = 0;
@@ -7931,11 +8104,11 @@ var Ir = () => {
 				y: (t.y - c) / p
 			};
 		})() : m, g = (d.left - s) / f, _ = (d.top - c) / p, v = g + d.width / f, y = _ + d.height / p;
-		return o[si] = h.x, o[ci] = h.y, o[li] = t._detectAnchor({
+		return o[di] = h.x, o[fi] = h.y, o[pi] = t._detectAnchor({
 			center: h.x,
 			start: g,
 			end: v
-		}), o[ui] = t._detectAnchor({
+		}), o[mi] = t._detectAnchor({
 			center: h.y,
 			start: _,
 			end: y
@@ -7962,7 +8135,7 @@ var Ir = () => {
 					withoutSave: !0
 				}), !0;
 				if (a === "gradient") {
-					let e = ai(r);
+					let e = li(r);
 					if (e) return n.setGradientBackground({
 						gradient: e,
 						customData: o,
@@ -7983,7 +8156,7 @@ var Ir = () => {
 				r.emitWarning({
 					origin: "TemplateManager",
 					method: "applyTemplate",
-					code: Sr.TEMPLATE_MANAGER.APPLY_FAILED,
+					code: Er.TEMPLATE_MANAGER.APPLY_FAILED,
 					message: "Не удалось применить фон из шаблона",
 					data: e
 				});
@@ -8006,7 +8179,7 @@ var Ir = () => {
 		};
 	}
 	static _cloneCustomData(e) {
-		if (!(!e || typeof e != "object")) return H({}, e);
+		if (!(!e || typeof e != "object")) return U({}, e);
 	}
 	static _getImageSource(e) {
 		let t = e;
@@ -8024,29 +8197,29 @@ var Ir = () => {
 	enlivenObjectEnlivables(e) {
 		return C.enlivenObjectEnlivables(e);
 	}
-}, fi = "#3D8BF4", pi = .5, mi = ({ distance: e }) => Number.isFinite(e) ? Math.round(Math.max(0, e)) : 0, hi = ({ firstDistance: e, secondDistance: t }) => {
-	let n = mi({ distance: e }), r = mi({ distance: t });
+}, gi = "#3D8BF4", _i = .5, vi = ({ distance: e }) => Number.isFinite(e) ? Math.round(Math.max(0, e)) : 0, yi = ({ firstDistance: e, secondDistance: t }) => {
+	let n = vi({ distance: e }), r = vi({ distance: t });
 	return {
 		firstDisplayDistance: n,
 		secondDisplayDistance: r,
 		displayDistanceDiff: Math.abs(n - r),
 		commonDisplayDistance: Math.max(n, r)
 	};
-}, gi = ({ firstStart: e, firstEnd: t, secondStart: n, secondEnd: r }) => Math.min(t, r) - Math.max(e, n), _i = ({ step: e }) => {
+}, bi = ({ firstStart: e, firstEnd: t, secondStart: n, secondEnd: r }) => Math.min(t, r) - Math.max(e, n), xi = ({ step: e }) => {
 	let t = Math.abs(e).toString(), n = t.indexOf(".");
 	return n === -1 ? 0 : t.slice(n + 1).length;
-}, vi = ({ value: e, step: t }) => {
+}, Si = ({ value: e, step: t }) => {
 	if (t === 0) return e;
-	let n = _i({ step: t }), r = Math.round(e / t) * t;
+	let n = xi({ step: t }), r = Math.round(e / t) * t;
 	return Number(r.toFixed(n));
-}, yi = ({ value: e, step: t }) => {
+}, Ci = ({ value: e, step: t }) => {
 	if (t === 0) return !0;
-	let n = vi({
+	let n = Si({
 		value: e,
 		step: t
-	}), r = _i({ step: t }), i = Math.pow(10, -(r + 4));
+	}), r = xi({ step: t }), i = Math.pow(10, -(r + 4));
 	return Math.abs(n - e) <= i;
-}, bi = ({ bounds: e, axis: t }) => {
+}, wi = ({ bounds: e, axis: t }) => {
 	let { left: n = 0, right: r = 0, top: i = 0, bottom: a = 0 } = e;
 	return t === "vertical" ? {
 		start: i,
@@ -8055,7 +8228,7 @@ var Ir = () => {
 		start: n,
 		end: r
 	};
-}, xi = ({ items: e, axis: t }) => {
+}, Ti = ({ items: e, axis: t }) => {
 	for (let n = 1; n < e.length; n += 1) {
 		let r = e[n], { bounds: i } = r, a = i[t], o = n - 1;
 		for (; o >= 0;) {
@@ -8065,10 +8238,10 @@ var Ir = () => {
 		}
 		e[o + 1] = r;
 	}
-}, Si = ({ items: e, index: t, axis: n, direction: r }) => {
+}, Ei = ({ items: e, index: t, axis: n, direction: r }) => {
 	let i = e[t];
 	if (!i) return null;
-	let { bounds: a } = i, { start: o, end: s } = bi({
+	let { bounds: a } = i, { start: o, end: s } = wi({
 		bounds: a,
 		axis: n
 	});
@@ -8076,7 +8249,7 @@ var Ir = () => {
 		for (let r = t - 1; r >= 0; --r) {
 			let t = e[r];
 			if (!t) continue;
-			let { bounds: i } = t, { end: a } = bi({
+			let { bounds: i } = t, { end: a } = wi({
 				bounds: i,
 				axis: n
 			});
@@ -8087,26 +8260,26 @@ var Ir = () => {
 	for (let r = t + 1; r < e.length; r += 1) {
 		let t = e[r];
 		if (!t) continue;
-		let { bounds: i } = t, { start: a } = bi({
+		let { bounds: i } = t, { start: a } = wi({
 			bounds: i,
 			axis: n
 		});
 		if (a - s >= 0) return r;
 	}
 	return null;
-}, Ci = ({ items: e }) => {
+}, Di = ({ items: e }) => {
 	for (let t = 0; t < e.length; t += 1) {
 		let { isActive: n } = e[t];
 		if (n) return t;
 	}
 	return -1;
-}, wi = ({ patternAxis: e, activeRangeStart: t, activeRangeEnd: n, tolerance: r = 0 }) => {
+}, Oi = ({ patternAxis: e, activeRangeStart: t, activeRangeEnd: n, tolerance: r = 0 }) => {
 	let i = Math.min(t, n), a = Math.max(t, n);
 	return e >= i - r && e <= a + r;
-}, Ti = ({ patternStart: e, patternEnd: t, activeStart: n, activeEnd: r }) => t <= n ? "before" : e >= r ? "after" : null, Ei = ({ baseOption: e, candidateOption: t }) => {
+}, ki = ({ patternStart: e, patternEnd: t, activeStart: n, activeEnd: r }) => t <= n ? "before" : e >= r ? "after" : null, Ai = ({ baseOption: e, candidateOption: t }) => {
 	let { delta: n, guide: { distance: r } } = e, { delta: i, guide: { distance: a } } = t;
 	return n === i && r === a;
-}, Di = ({ options: e }) => {
+}, ji = ({ options: e }) => {
 	let t = e[0];
 	for (let n = 1; n < e.length; n += 1) {
 		let r = e[n];
@@ -8117,11 +8290,11 @@ var Ir = () => {
 		r.diff === t.diff && Math.abs(r.delta) < Math.abs(t.delta) && (t = r);
 	}
 	return t;
-}, Oi = ({ currentOption: e, nextOption: t }) => {
+}, Mi = ({ currentOption: e, nextOption: t }) => {
 	if (!e) return !0;
 	let { contextDistance: n, diff: r, delta: i } = e, { contextDistance: a, diff: o, delta: s } = t;
 	return a < n ? !0 : a > n ? !1 : o < r ? !0 : o > r ? !1 : Math.abs(s) < Math.abs(i);
-}, ki = ({ options: e }) => {
+}, Ni = ({ options: e }) => {
 	let t = [], n = null, r = null;
 	for (let i of e) {
 		let { kind: e, side: a } = i;
@@ -8129,18 +8302,18 @@ var Ir = () => {
 			t.push(i);
 			continue;
 		}
-		a === "before" && Oi({
+		a === "before" && Mi({
 			currentOption: n,
 			nextOption: i
-		}) && (n = i), a === "after" && Oi({
+		}) && (n = i), a === "after" && Mi({
 			currentOption: r,
 			nextOption: i
 		}) && (r = i);
 	}
 	return n && t.push(n), r && t.push(r), t;
-}, Ai = ({ options: e, side: t, baseOption: n }) => {
+}, Pi = ({ options: e, side: t, baseOption: n }) => {
 	let r = null;
-	for (let i of e) if (i.side === t && Ei({
+	for (let i of e) if (i.side === t && Ai({
 		baseOption: n,
 		candidateOption: i
 	})) {
@@ -8151,63 +8324,63 @@ var Ir = () => {
 		!r || i.diff !== r.diff || Math.abs(i.delta) < Math.abs(r.delta) && (r = i);
 	}
 	return r;
-}, ji = ({ option: e }) => {
+}, Fi = ({ option: e }) => {
 	let { side: t, kind: n, guide: { distance: r } } = e;
 	return {
 		side: t,
 		kind: n,
 		distance: r
 	};
-}, Mi = ({ option: e, context: t }) => {
+}, Ii = ({ option: e, context: t }) => {
 	let { side: n, kind: r, distance: i } = t, { side: a, kind: o, guide: { distance: s } } = e;
 	return n !== a || r !== o ? !1 : Math.abs(s - i) <= 1;
-}, Ni = ({ options: e, context: t }) => {
+}, Li = ({ options: e, context: t }) => {
 	if (!t) return null;
-	for (let n of e) if (Mi({
+	for (let n of e) if (Ii({
 		option: n,
 		context: t
 	})) return n;
 	return null;
-}, Pi = ({ options: e, bestOption: t, previousContext: n, switchDistance: r = 0 }) => {
-	let i = Ni({
+}, Ri = ({ options: e, bestOption: t, previousContext: n, switchDistance: r = 0 }) => {
+	let i = Li({
 		options: e,
 		context: n
 	});
 	if (!i) return t;
 	let a = Math.max(0, r);
 	return a === 0 || Math.abs(t.delta - i.delta) >= a ? t : i;
-}, Fi = ({ guides: e, seenGuideKeys: t, guide: n }) => {
+}, zi = ({ guides: e, seenGuideKeys: t, guide: n }) => {
 	let { type: r, axis: i, refStart: a, refEnd: o, activeStart: s, activeEnd: c, distance: l } = n, u = `${r}:${i}:${a}:${o}:${s}:${c}:${l}`;
 	t.has(u) || (t.add(u), e.push(n));
-}, Ii = ({ options: e, previousContext: t = null, switchDistance: n = 0 }) => {
+}, Bi = ({ options: e, previousContext: t = null, switchDistance: n = 0 }) => {
 	if (!e.length) return {
 		delta: 0,
 		guides: [],
 		context: null
 	};
-	let r = ki({ options: e }), i = [];
+	let r = Ni({ options: e }), i = [];
 	for (let e of r) e.kind === "reference" && i.push(e);
-	let a = i.length > 0, o = a ? i : r, s = Pi({
+	let a = i.length > 0, o = a ? i : r, s = Ri({
 		options: o,
-		bestOption: Di({ options: o }),
+		bestOption: ji({ options: o }),
 		previousContext: t,
 		switchDistance: n
-	}), c = Ai({
+	}), c = Pi({
 		options: o,
 		side: "before",
 		baseOption: s
-	}), l = Ai({
+	}), l = Pi({
 		options: o,
 		side: "after",
 		baseOption: s
-	}), u = Ai({
+	}), u = Pi({
 		options: a ? r : o,
 		side: "center",
 		baseOption: s
 	}), d = [];
 	c && l ? d.push(c, l) : (d.push(s), s.side === "before" && l && d.push(l), s.side === "after" && c && d.push(c), s.side === "center" && (c && !l && d.push(c), l && !c && d.push(l)), a && s.side === "before" && !l && u && d.push(u), a && s.side === "after" && !c && u && d.push(u)), !d.length && u && d.push(u);
 	let f = [], p = /* @__PURE__ */ new Set();
-	for (let e of d) Fi({
+	for (let e of d) zi({
 		guides: f,
 		seenGuideKeys: p,
 		guide: e.guide
@@ -8215,15 +8388,15 @@ var Ir = () => {
 	return {
 		delta: s.delta,
 		guides: f,
-		context: ji({ option: s })
+		context: Fi({ option: s })
 	};
-}, Li = ({ activeStart: e, activeEnd: t, targetGap: n, beforeEdge: r, afterEdge: i, threshold: a, step: o }) => {
-	let s = n - (e - r), c = vi({
+}, Vi = ({ activeStart: e, activeEnd: t, targetGap: n, beforeEdge: r, afterEdge: i, threshold: a, step: o }) => {
+	let s = n - (e - r), c = Si({
 		value: s,
 		step: o
 	}), l = Math.max(1, Math.ceil(a / Math.max(o, 1))), u = null;
 	for (let d = -l; d <= l; d += 1) {
-		let l = c + d * o, f = e + l, p = t + l, m = f - r, h = i - p, { displayDistanceDiff: g, commonDisplayDistance: _ } = hi({
+		let l = c + d * o, f = e + l, p = t + l, m = f - r, h = i - p, { displayDistanceDiff: g, commonDisplayDistance: _ } = yi({
 			firstDistance: m,
 			secondDistance: h
 		});
@@ -8238,13 +8411,13 @@ var Ir = () => {
 		});
 	}
 	return u;
-}, Ri = ({ currentGap: e, referenceGap: t }) => {
-	let { secondDisplayDistance: n, displayDistanceDiff: r } = hi({
+}, Hi = ({ currentGap: e, referenceGap: t }) => {
+	let { secondDisplayDistance: n, displayDistanceDiff: r } = yi({
 		firstDistance: e,
 		secondDistance: t
 	});
 	return r > 1 ? null : n;
-}, zi = ({ anchors: e, positions: t, threshold: n }) => {
+}, Ui = ({ anchors: e, positions: t, threshold: n }) => {
 	let r = 0, i = n + 1, a = null;
 	for (let o of t) for (let t of e) {
 		let e = Math.abs(t - o);
@@ -8254,8 +8427,8 @@ var Ir = () => {
 		delta: r,
 		guidePosition: a
 	};
-}, Bi = ({ activeBounds: e, threshold: t, anchors: n }) => {
-	let { left: r, right: i, centerX: a, top: o, bottom: s, centerY: c } = e, l = zi({
+}, Wi = ({ activeBounds: e, threshold: t, anchors: n }) => {
+	let { left: r, right: i, centerX: a, top: o, bottom: s, centerY: c } = e, l = Ui({
 		anchors: n.vertical,
 		positions: [
 			r,
@@ -8263,7 +8436,7 @@ var Ir = () => {
 			i
 		],
 		threshold: t
-	}), u = zi({
+	}), u = Ui({
 		anchors: n.horizontal,
 		positions: [
 			o,
@@ -8283,11 +8456,11 @@ var Ir = () => {
 		deltaY: u.delta,
 		guides: d
 	};
-}, Vi = ({ activeBounds: e, candidates: t, threshold: n, patterns: r, previousContext: i = null, switchDistance: a = 0 }) => {
+}, Gi = ({ activeBounds: e, candidates: t, threshold: n, patterns: r, previousContext: i = null, switchDistance: a = 0 }) => {
 	let { centerX: o, top: s, bottom: c, left: l, right: u } = e, d = [];
 	for (let e of t) {
 		let { left: t, right: n } = e;
-		gi({
+		bi({
 			firstStart: t,
 			firstEnd: n,
 			secondStart: l,
@@ -8307,22 +8480,22 @@ var Ir = () => {
 	f.push({
 		bounds: e,
 		isActive: !0
-	}), xi({
+	}), Ti({
 		items: f,
 		axis: "top"
 	});
-	let p = Ci({ items: f });
+	let p = Di({ items: f });
 	if (p === -1) return {
 		delta: 0,
 		guides: [],
 		context: null
 	};
-	let m = [], h = c - s, g = Si({
+	let m = [], h = c - s, g = Ei({
 		items: f,
 		index: p,
 		axis: "vertical",
 		direction: "prev"
-	}), _ = Si({
+	}), _ = Ei({
 		items: f,
 		index: p,
 		axis: "vertical",
@@ -8331,19 +8504,19 @@ var Ir = () => {
 	if (v && y) {
 		let { bounds: e } = v, { bounds: t } = y, { bottom: r } = e, { top: i } = t, a = i - r - h;
 		if (a >= 0) {
-			let e = vi({
+			let e = Si({
 				value: a / 2,
 				step: 1
 			}), t = s - r, l = i - c, u = Math.abs(t - e), d = Math.abs(l - e);
 			if (Math.max(u, d) <= n) {
-				let t = Li({
+				let t = Vi({
 					activeStart: s,
 					activeEnd: c,
 					targetGap: e,
 					beforeEdge: r,
 					afterEdge: i,
 					threshold: n,
-					step: pi
+					step: _i
 				});
 				if (t) {
 					let { delta: e, distance: n, diff: i, activeStart: a, activeEnd: s } = t, c = {
@@ -8380,16 +8553,16 @@ var Ir = () => {
 	}
 	for (let e of r) {
 		let { axis: t, start: r, end: i, distance: a } = e;
-		if (!yi({
+		if (!Ci({
 			value: a,
 			step: .5
-		}) || !wi({
+		}) || !Oi({
 			patternAxis: t,
 			activeRangeStart: l,
 			activeRangeEnd: u,
 			tolerance: n
 		})) continue;
-		let d = Ti({
+		let d = ki({
 			patternStart: r,
 			patternEnd: i,
 			activeStart: s,
@@ -8397,12 +8570,12 @@ var Ir = () => {
 		});
 		if (d) {
 			if (b !== null && S && d === "before" && Math.abs(b - a) <= n) {
-				let e = vi({
+				let e = Si({
 					value: a - b,
 					step: 1
 				}), t = s + e, { bottom: c } = S, l = t - c, u = Math.abs(l - a);
 				if (u > n) continue;
-				let d = Ri({
+				let d = Hi({
 					currentGap: l,
 					referenceGap: a
 				});
@@ -8426,12 +8599,12 @@ var Ir = () => {
 				});
 			}
 			if (x !== null && C && d === "after" && Math.abs(x - a) <= n) {
-				let e = vi({
+				let e = Si({
 					value: x - a,
 					step: 1
 				}), t = c + e, { top: s } = C, l = s - t, u = Math.abs(l - a);
 				if (u > n) continue;
-				let d = Ri({
+				let d = Hi({
 					currentGap: l,
 					referenceGap: a
 				});
@@ -8456,16 +8629,16 @@ var Ir = () => {
 			}
 		}
 	}
-	return Ii({
+	return Bi({
 		options: m,
 		previousContext: i,
 		switchDistance: a
 	});
-}, Hi = ({ activeBounds: e, candidates: t, threshold: n, patterns: r, previousContext: i = null, switchDistance: a = 0 }) => {
+}, Ki = ({ activeBounds: e, candidates: t, threshold: n, patterns: r, previousContext: i = null, switchDistance: a = 0 }) => {
 	let { centerY: o, left: s, right: c, top: l, bottom: u } = e, d = [];
 	for (let e of t) {
 		let { top: t, bottom: n } = e;
-		gi({
+		bi({
 			firstStart: t,
 			firstEnd: n,
 			secondStart: l,
@@ -8485,22 +8658,22 @@ var Ir = () => {
 	f.push({
 		bounds: e,
 		isActive: !0
-	}), xi({
+	}), Ti({
 		items: f,
 		axis: "left"
 	});
-	let p = Ci({ items: f });
+	let p = Di({ items: f });
 	if (p === -1) return {
 		delta: 0,
 		guides: [],
 		context: null
 	};
-	let m = [], h = c - s, g = Si({
+	let m = [], h = c - s, g = Ei({
 		items: f,
 		index: p,
 		axis: "horizontal",
 		direction: "prev"
-	}), _ = Si({
+	}), _ = Ei({
 		items: f,
 		index: p,
 		axis: "horizontal",
@@ -8509,19 +8682,19 @@ var Ir = () => {
 	if (v && y) {
 		let { bounds: e } = v, { bounds: t } = y, { right: r } = e, { left: i } = t, a = i - r - h;
 		if (a >= 0) {
-			let e = vi({
+			let e = Si({
 				value: a / 2,
 				step: 1
 			}), t = s - r, l = i - c, u = Math.abs(t - e), d = Math.abs(l - e);
 			if (Math.max(u, d) <= n) {
-				let t = Li({
+				let t = Vi({
 					activeStart: s,
 					activeEnd: c,
 					targetGap: e,
 					beforeEdge: r,
 					afterEdge: i,
 					threshold: n,
-					step: pi
+					step: _i
 				});
 				if (t) {
 					let { delta: e, distance: n, diff: i, activeStart: a, activeEnd: s } = t, c = {
@@ -8558,16 +8731,16 @@ var Ir = () => {
 	}
 	for (let e of r) {
 		let { axis: t, start: r, end: i, distance: a } = e;
-		if (!yi({
+		if (!Ci({
 			value: a,
 			step: .5
-		}) || !wi({
+		}) || !Oi({
 			patternAxis: t,
 			activeRangeStart: l,
 			activeRangeEnd: u,
 			tolerance: n
 		})) continue;
-		let d = Ti({
+		let d = ki({
 			patternStart: r,
 			patternEnd: i,
 			activeStart: s,
@@ -8575,12 +8748,12 @@ var Ir = () => {
 		});
 		if (d) {
 			if (b !== null && S && d === "before" && Math.abs(b - a) <= n) {
-				let e = vi({
+				let e = Si({
 					value: a - b,
 					step: 1
 				}), t = s + e, { right: c } = S, l = t - c, u = Math.abs(l - a);
 				if (u > n) continue;
-				let d = Ri({
+				let d = Hi({
 					currentGap: l,
 					referenceGap: a
 				});
@@ -8604,12 +8777,12 @@ var Ir = () => {
 				});
 			}
 			if (x !== null && C && d === "after" && Math.abs(x - a) <= n) {
-				let e = vi({
+				let e = Si({
 					value: x - a,
 					step: 1
 				}), t = c + e, { left: s } = C, l = s - t, u = Math.abs(l - a);
 				if (u > n) continue;
-				let d = Ri({
+				let d = Hi({
 					currentGap: l,
 					referenceGap: a
 				});
@@ -8634,20 +8807,20 @@ var Ir = () => {
 			}
 		}
 	}
-	return Ii({
+	return Bi({
 		options: m,
 		previousContext: i,
 		switchDistance: a
 	});
-}, Ui = ({ activeBounds: e, candidates: t, threshold: n, spacingPatterns: r, previousContexts: i, switchDistance: a = 0 }) => {
-	let { vertical: o = null, horizontal: s = null } = i == null ? {} : i, c = Vi({
+}, qi = ({ activeBounds: e, candidates: t, threshold: n, spacingPatterns: r, previousContexts: i, switchDistance: a = 0 }) => {
+	let { vertical: o = null, horizontal: s = null } = i == null ? {} : i, c = Gi({
 		activeBounds: e,
 		candidates: t,
 		threshold: n,
 		patterns: r.vertical,
 		previousContext: o,
 		switchDistance: a
-	}), l = Hi({
+	}), l = Ki({
 		activeBounds: e,
 		candidates: t,
 		threshold: n,
@@ -8666,14 +8839,14 @@ var Ir = () => {
 			horizontal: l.context
 		}
 	};
-}, Wi = ({ context: e, x: t, y: n, width: r, height: i, radius: a }) => {
+}, Ji = ({ context: e, x: t, y: n, width: r, height: i, radius: a }) => {
 	let o = Math.min(a, r / 2, i / 2);
 	e.moveTo(t + o, n), e.lineTo(t + r - o, n), e.quadraticCurveTo(t + r, n, t + r, n + o), e.lineTo(t + r, n + i - o), e.quadraticCurveTo(t + r, n + i, t + r - o, n + i), e.lineTo(t + o, n + i), e.quadraticCurveTo(t, n + i, t, n + i - o), e.lineTo(t, n + o), e.quadraticCurveTo(t, n, t + o, n), e.closePath();
-}, Gi = ({ context: e, type: t, axis: n, start: r, end: i, text: a, zoom: o, color: s, textColor: c = "#ffffff", fontFamily: l = "sans-serif", lineWidth: u = 1, padding: d = 4, radius: f = 4, offsetAlongAxis: p = 0, offsetPerpendicular: m = 0 }) => {
+}, Yi = ({ context: e, type: t, axis: n, start: r, end: i, text: a, zoom: o, color: s, textColor: c = "#ffffff", fontFamily: l = "sans-serif", lineWidth: u = 1, padding: d = 4, radius: f = 4, offsetAlongAxis: p = 0, offsetPerpendicular: m = 0 }) => {
 	let h = o || 1, g = 12 / h, _ = d / h, v = f / h, y = (r + i) / 2 + p, b = t === "vertical" ? n + m : y, x = t === "vertical" ? y : n + m;
 	e.save(), e.setLineDash([]), e.fillStyle = s, e.strokeStyle = s, e.lineWidth = u / h, e.font = `${g}px ${l}`, e.textAlign = "center", e.textBaseline = "middle";
 	let S = e.measureText(a).width + _ * 2, C = g + _ * 2, w = b - S / 2, T = x - C / 2;
-	e.beginPath(), Wi({
+	e.beginPath(), Ji({
 		context: e,
 		x: w,
 		y: T,
@@ -8681,11 +8854,11 @@ var Ir = () => {
 		height: C,
 		radius: v
 	}), e.fill(), e.fillStyle = c, e.fillText(a, b, x), e.restore();
-}, Ki = ({ context: e, guide: t, zoom: n }) => {
-	let { type: r, axis: i, refStart: a, refEnd: o, activeStart: s, activeEnd: c, distance: l } = t, u = mi({ distance: l }).toString();
+}, Xi = ({ context: e, guide: t, zoom: n }) => {
+	let { type: r, axis: i, refStart: a, refEnd: o, activeStart: s, activeEnd: c, distance: l } = t, u = vi({ distance: l }).toString();
 	e.beginPath(), r === "vertical" ? (e.moveTo(i, a), e.lineTo(i, o), e.moveTo(i, s), e.lineTo(i, c)) : (e.moveTo(a, i), e.lineTo(o, i), e.moveTo(s, i), e.lineTo(c, i)), e.stroke();
-	let d = fi;
-	Gi({
+	let d = gi;
+	Yi({
 		context: e,
 		type: r,
 		axis: i,
@@ -8695,7 +8868,7 @@ var Ir = () => {
 		zoom: n,
 		color: d,
 		lineWidth: 1
-	}), Gi({
+	}), Yi({
 		context: e,
 		type: r,
 		axis: i,
@@ -8706,10 +8879,10 @@ var Ir = () => {
 		color: d,
 		lineWidth: 1
 	});
-}, qi = ({ anchors: e, bounds: t }) => {
+}, Zi = ({ anchors: e, bounds: t }) => {
 	let { left: n, right: r, centerX: i, top: a, bottom: o, centerY: s } = t;
 	e.vertical.push(n, i, r), e.horizontal.push(a, s, o);
-}, Ji = ({ bounds: e, type: t, primaryStart: n, primaryEnd: r }) => {
+}, Qi = ({ bounds: e, type: t, primaryStart: n, primaryEnd: r }) => {
 	let i = [], a = n === "top" ? "left" : "top", o = r === "bottom" ? "right" : "bottom", s = [...e].sort((e, t) => e[n] - t[n]);
 	for (let e = 0; e < s.length; e += 1) {
 		let c = s[e], l = null, u = Infinity;
@@ -8730,35 +8903,35 @@ var Ir = () => {
 		});
 	}
 	return i;
-}, Yi = ({ bounds: e }) => ({
-	vertical: Ji({
+}, $i = ({ bounds: e }) => ({
+	vertical: Qi({
 		bounds: e,
 		axis: "centerX",
 		type: "vertical",
 		primaryStart: "top",
 		primaryEnd: "bottom"
 	}),
-	horizontal: Ji({
+	horizontal: Qi({
 		bounds: e,
 		axis: "centerY",
 		type: "horizontal",
 		primaryStart: "left",
 		primaryEnd: "right"
 	})
-}), Xi = [
+}), ea = [
 	"montage-area",
 	"background",
 	"interaction-blocker"
-], Zi = ({ activeObject: t }) => {
+], ta = ({ activeObject: t }) => {
 	let n = /* @__PURE__ */ new Set();
 	return t ? (n.add(t), t instanceof e && t.getObjects().forEach((e) => n.add(e)), n) : n;
-}, Qi = ({ object: e, excluded: t, ignoredIds: n = Xi }) => {
+}, na = ({ object: e, excluded: t, ignoredIds: n = ea }) => {
 	if (t.has(e)) return !0;
 	let { visible: r = !0 } = e;
 	if (!r) return !0;
 	let { id: i } = e;
 	return !!(i && n.includes(i));
-}, $i = class e {
+}, ra = class e {
 	constructor({ editor: e }) {
 		this.anchors = {
 			vertical: [],
@@ -8812,7 +8985,7 @@ var Ir = () => {
 			this._clearSpacingContexts(), this._clearGuides();
 			return;
 		}
-		let { canvas: s } = this, c = s.getZoom() || 1, l = 5 / c, { deltaX: u, deltaY: d } = Bi({
+		let { canvas: s } = this, c = s.getZoom() || 1, l = 5 / c, { deltaX: u, deltaY: d } = Wi({
 			activeBounds: o,
 			threshold: l,
 			anchors: this.anchors
@@ -8825,7 +8998,7 @@ var Ir = () => {
 				top: t + d
 			}), r.setCoords(), o = (f = ct({ object: r })) == null ? o : f;
 		}
-		let p = this._resolveCurrentTargetBounds({ activeObject: r }), m = this.spacingContexts.vertical || this.spacingContexts.horizontal ? 10 / c : l, h = Ui({
+		let p = this._resolveCurrentTargetBounds({ activeObject: r }), m = this.spacingContexts.vertical || this.spacingContexts.horizontal ? 10 / c : l, h = qi({
 			activeBounds: o,
 			candidates: p,
 			threshold: m,
@@ -8847,11 +9020,11 @@ var Ir = () => {
 			target: r,
 			transform: a
 		});
-		let v = (n = ct({ object: r })) == null ? o : n, y = Bi({
+		let v = (n = ct({ object: r })) == null ? o : n, y = Wi({
 			activeBounds: v,
 			threshold: l,
 			anchors: this.anchors
-		}), b = Ui({
+		}), b = qi({
 			activeBounds: v,
 			candidates: p,
 			threshold: l,
@@ -9067,9 +9240,9 @@ var Ir = () => {
 		let { canvas: e, guideBounds: t } = this, n = e.getSelectionContext();
 		if (!n) return;
 		let { left: r, right: i, top: a, bottom: o } = t == null ? this._calculateViewportBounds() : t, { viewportTransform: s } = e, c = e.getZoom() || 1;
-		n.save(), Array.isArray(s) && n.transform(...s), n.lineWidth = 1 / c, n.strokeStyle = fi, n.setLineDash([4, 4]);
+		n.save(), Array.isArray(s) && n.transform(...s), n.lineWidth = 1 / c, n.strokeStyle = gi, n.setLineDash([4, 4]);
 		for (let e of this.activeGuides) n.beginPath(), e.type === "vertical" ? (n.moveTo(e.position, a), n.lineTo(e.position, o)) : (n.moveTo(r, e.position), n.lineTo(i, e.position)), n.stroke();
-		for (let e of this.activeSpacingGuides) Ki({
+		for (let e of this.activeSpacingGuides) Xi({
 			context: n,
 			guide: e,
 			zoom: c
@@ -9277,14 +9450,14 @@ var Ir = () => {
 		}, r = [];
 		for (let e of t) {
 			let t = ct({ object: e });
-			t && (qi({
+			t && (Zi({
 				anchors: n,
 				bounds: t
 			}), r.push(t));
 		}
 		let { montageArea: i } = this.editor, a = ct({ object: i });
 		if (a) {
-			qi({
+			Zi({
 				anchors: n,
 				bounds: a
 			});
@@ -9296,12 +9469,12 @@ var Ir = () => {
 				bottom: i
 			};
 		} else this.guideBounds = this._calculateViewportBounds();
-		this.anchors = n, this.spacingPatterns = Yi({ bounds: r }), this.cachedTargetBounds = r;
+		this.anchors = n, this.spacingPatterns = $i({ bounds: r }), this.cachedTargetBounds = r;
 	}
 	_collectTargets({ activeObject: e }) {
-		let t = Zi({ activeObject: e }), n = [];
+		let t = ta({ activeObject: e }), n = [];
 		return this.canvas.forEachObject((e) => {
-			Qi({
+			na({
 				object: e,
 				excluded: t
 			}) || n.push(e);
@@ -9324,7 +9497,7 @@ var Ir = () => {
 			bottom: (r - s) / a
 		};
 	}
-}, ea = "#3D8BF4", ta = class e {
+}, ia = "#3D8BF4", aa = class e {
 	constructor({ editor: e }) {
 		this.activeGuides = [], this.isAltPressed = !1, this.pendingEvent = null, this.frameRequest = null, this.isToolbarHidden = !1, this.isTargetMontageArea = !1, this.lastMouseEvent = null, this.editor = e, this.canvas = e.canvas, this._onMouseMove = this._handleMouseMove.bind(this), this._onBeforeRender = this._handleBeforeRender.bind(this), this._onAfterRender = this._handleAfterRender.bind(this), this._onSelectionCleared = this._handleSelectionCleared.bind(this), this._onKeyDown = this._handleKeyDown.bind(this), this._onKeyUp = this._handleKeyUp.bind(this), this._onWindowBlur = this._handleWindowBlur.bind(this), this._bindEvents();
 	}
@@ -9417,8 +9590,8 @@ var Ir = () => {
 		this.isTargetMontageArea = l, this.activeGuides = d, this._hideToolbar(), n.requestRenderAll();
 	}
 	static _resolveTarget({ event: e, activeObject: t }) {
-		let { target: n } = e, r = Zi({ activeObject: t });
-		return n && !Qi({
+		let { target: n } = e, r = ta({ activeObject: t });
+		return n && !na({
 			object: n,
 			excluded: r
 		}) ? n : null;
@@ -9535,18 +9708,18 @@ var Ir = () => {
 		let { canvas: e } = this, t = e.getSelectionContext();
 		if (!t) return;
 		let { viewportTransform: n } = e, r = e.getZoom() || 1, i = this.activeGuides.some((e) => e.type === "vertical"), a = this.activeGuides.some((e) => e.type === "horizontal"), o = i && a && !this.isTargetMontageArea, s = o ? 12 / r : 0;
-		t.save(), Array.isArray(n) && t.transform(...n), t.lineWidth = 1 / r, t.strokeStyle = ea, t.setLineDash([]);
+		t.save(), Array.isArray(n) && t.transform(...n), t.lineWidth = 1 / r, t.strokeStyle = ia, t.setLineDash([]);
 		for (let e of this.activeGuides) {
 			let { type: n, axis: i, start: a, end: c, distance: l } = e, u = Math.abs(c - a), d = o ? (a <= c ? -1 : 1) * (u / 2 + s) : 0;
-			t.beginPath(), n === "vertical" ? (t.moveTo(i, a), t.lineTo(i, c)) : (t.moveTo(a, i), t.lineTo(c, i)), t.stroke(), Gi({
+			t.beginPath(), n === "vertical" ? (t.moveTo(i, a), t.lineTo(i, c)) : (t.moveTo(a, i), t.lineTo(c, i)), t.stroke(), Yi({
 				context: t,
 				type: n,
 				axis: i,
 				start: a,
 				end: c,
-				text: mi({ distance: l }).toString(),
+				text: vi({ distance: l }).toString(),
 				zoom: r,
-				color: ea,
+				color: ia,
 				lineWidth: 1,
 				offsetAlongAxis: d,
 				offsetPerpendicular: 0
@@ -9566,15 +9739,15 @@ var Ir = () => {
 		let { toolbar: t } = this.editor;
 		t == null || (e = t.showAfterTemporary) == null || e.call(t), this.isToolbarHidden = !1;
 	}
-}, na = [
+}, oa = [
 	"source",
 	"scale",
 	"withoutSave"
-], ra = [
+], sa = [
 	"source",
 	"scale",
 	"withoutSave"
-], ia = class e {
+], ca = class e {
 	constructor(e, t) {
 		this.options = t, this.containerId = e, this.editorId = `${e}-${D()}`, this.init();
 	}
@@ -9583,7 +9756,7 @@ var Ir = () => {
 		return k(function* () {
 			var n;
 			let { editorContainerWidth: r, editorContainerHeight: i, canvasWrapperWidth: a, canvasWrapperHeight: o, canvasCSSWidth: s, canvasCSSHeight: c, initialImage: l, initialState: u, scaleType: d, showRotationAngle: f, _onReadyCallback: p } = e.options;
-			if (B.apply(), e.canvas = new t(e.containerId, e.options), e.moduleLoader = new M(), e.workerManager = new P(), e.errorManager = new Cr({ editor: e }), e.historyManager = new Ue({ editor: e }), e.toolbar = new U({ editor: e }), e.transformManager = new tt({ editor: e }), e.zoomManager = new nt({ editor: e }), e.canvasManager = new et({ editor: e }), e.imageManager = new Ye({ editor: e }), e.layerManager = new gt({ editor: e }), e.shapeManager = new gr({ editor: e }), e.interactionBlocker = new mt({ editor: e }), e.backgroundManager = new ht({ editor: e }), e.clipboardManager = new _r({ editor: e }), e.objectLockManager = new vr({ editor: e }), e.groupingManager = new yr({ editor: e }), e.selectionManager = new br({ editor: e }), e.deletionManager = new xr({ editor: e }), e.panConstraintManager = new wr({ editor: e }), e.snappingManager = new $i({ editor: e }), e.measurementManager = new ta({ editor: e }), e.fontManager = new oe((n = e.options.fonts) == null ? [] : n), e.textManager = new ri({ editor: e }), e.templateManager = new di({ editor: e }), f && (e.angleIndicator = new pe({ editor: e })), e._createMontageArea(), e._createClippingArea(), e.listeners = new j({
+			if (V.apply(), e.canvas = new t(e.containerId, e.options), e.moduleLoader = new M(), e.workerManager = new ee(), e.errorManager = new Dr({ editor: e }), e.historyManager = new Ue({ editor: e }), e.toolbar = new W({ editor: e }), e.transformManager = new tt({ editor: e }), e.zoomManager = new nt({ editor: e }), e.canvasManager = new et({ editor: e }), e.imageManager = new Ye({ editor: e }), e.layerManager = new gt({ editor: e }), e.shapeManager = new br({ editor: e }), e.interactionBlocker = new mt({ editor: e }), e.backgroundManager = new ht({ editor: e }), e.clipboardManager = new xr({ editor: e }), e.objectLockManager = new Sr({ editor: e }), e.groupingManager = new Cr({ editor: e }), e.selectionManager = new wr({ editor: e }), e.deletionManager = new Tr({ editor: e }), e.panConstraintManager = new Or({ editor: e }), e.snappingManager = new ra({ editor: e }), e.measurementManager = new aa({ editor: e }), e.fontManager = new ae((n = e.options.fonts) == null ? [] : n), e.textManager = new si({ editor: e }), e.templateManager = new hi({ editor: e }), f && (e.angleIndicator = new pe({ editor: e })), e._createMontageArea(), e._createClippingArea(), e.listeners = new j({
 				editor: e,
 				options: e.options
 			}), e.canvasManager.setEditorContainerWidth(r), e.canvasManager.setEditorContainerHeight(i), e.canvasManager.setCanvasWrapperWidth(a), e.canvasManager.setCanvasWrapperHeight(o), e.canvasManager.setCanvasCSSWidth(s), e.canvasManager.setCanvasCSSHeight(c), e.canvasManager.updateCanvas(), e.zoomManager.calculateAndApplyDefaultZoom(), yield e.fontManager.loadFonts(), u) {
@@ -9593,8 +9766,8 @@ var Ir = () => {
 					yield e.historyManager.loadStateFromFullState(t);
 				} catch (t) {
 					if (l != null && l.source) {
-						let { source: t, scale: n = `image-${d}`, withoutSave: r = !0 } = l, i = ut(l, na);
-						yield e.imageManager.importImage(H({
+						let { source: t, scale: n = `image-${d}`, withoutSave: r = !0 } = l, i = ut(l, oa);
+						yield e.imageManager.importImage(U({
 							source: t,
 							scale: n,
 							withoutSave: r
@@ -9611,8 +9784,8 @@ var Ir = () => {
 					e.historyManager.resumeHistory();
 				}
 			} else if (l != null && l.source) {
-				let { source: t, scale: n = `image-${d}`, withoutSave: r = !0 } = l, i = ut(l, ra);
-				yield e.imageManager.importImage(H({
+				let { source: t, scale: n = `image-${d}`, withoutSave: r = !0 } = l, i = ut(l, sa);
+				yield e.imageManager.importImage(U({
 					source: t,
 					scale: n,
 					withoutSave: r
@@ -9689,7 +9862,7 @@ var Ir = () => {
 	"U+A640-A69F",
 	"U+FE2E-FE2F",
 	"U+2116"
-].join(", "), aa = {
+].join(", "), la = {
 	preserveObjectStacking: !0,
 	controlsAboveOverlay: !0,
 	centeredRotation: !0,
@@ -10563,17 +10736,17 @@ var Ir = () => {
 };
 //#endregion
 //#region src/main.ts
-function oa(e, t = {}) {
-	let n = H(H({}, aa), t), r = document.getElementById(e);
+function ua(e, t = {}) {
+	let n = U(U({}, la), t), r = document.getElementById(e);
 	if (!r) return Promise.reject(/* @__PURE__ */ Error(`Контейнер с ID "${e}" не найден.`));
 	let i = document.createElement("canvas");
 	return i.id = `${e}-canvas`, r.appendChild(i), n.editorContainer = r, new Promise((t) => {
 		n._onReadyCallback = t;
-		let r = new ia(i.id, n);
+		let r = new ca(i.id, n);
 		window[e] = r;
 	});
 }
 //#endregion
-export { oa as default };
+export { ua as default };
 
 //# sourceMappingURL=main.js.map