@harbour-enterprises/superdoc 1.17.0-next.24 → 1.17.0-next.27

package/dist/chunks/{SuperConverter-Dpef8fg5.es.js → SuperConverter-B_fGJA0T.es.js}

@@ -10901,6 +10901,54 @@ function extractFillColor(spPr, style) {
 	}
 	return null;
 }
+function extractCustomGeometry(spPr) {
+	const custGeom = spPr?.elements?.find((el) => el.name === "a:custGeom");
+	if (!custGeom) return null;
+	const pathLst = custGeom.elements?.find((el) => el.name === "a:pathLst");
+	if (!pathLst?.elements) return null;
+	const paths = pathLst.elements.filter((el) => el.name === "a:path").map((pathEl) => {
+		const w = parseInt(pathEl.attributes?.["w"] || "0", 10);
+		const h = parseInt(pathEl.attributes?.["h"] || "0", 10);
+		return {
+			d: convertDrawingMLPathToSvg(pathEl),
+			w,
+			h
+		};
+	}).filter((p) => p.d);
+	if (paths.length === 0) return null;
+	return { paths };
+}
+function convertDrawingMLPathToSvg(pathEl) {
+	if (!pathEl?.elements) return "";
+	const parts = [];
+	for (const cmd of pathEl.elements) switch (cmd.name) {
+		case "a:moveTo": {
+			const pt = cmd.elements?.find((el) => el.name === "a:pt");
+			if (pt) parts.push(`M ${pt.attributes?.["x"] || 0} ${pt.attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:lnTo": {
+			const pt = cmd.elements?.find((el) => el.name === "a:pt");
+			if (pt) parts.push(`L ${pt.attributes?.["x"] || 0} ${pt.attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:cubicBezTo": {
+			const pts = cmd.elements?.filter((el) => el.name === "a:pt") || [];
+			if (pts.length === 3) parts.push(`C ${pts[0].attributes?.["x"] || 0} ${pts[0].attributes?.["y"] || 0} ${pts[1].attributes?.["x"] || 0} ${pts[1].attributes?.["y"] || 0} ${pts[2].attributes?.["x"] || 0} ${pts[2].attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:quadBezTo": {
+			const pts = cmd.elements?.filter((el) => el.name === "a:pt") || [];
+			if (pts.length === 2) parts.push(`Q ${pts[0].attributes?.["x"] || 0} ${pts[0].attributes?.["y"] || 0} ${pts[1].attributes?.["x"] || 0} ${pts[1].attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:close":
+			parts.push("Z");
+			break;
+		default: break;
+	}
+	return parts.join(" ");
+}
 function extractGradientFill(gradFill) {
 	const gradient = {
 		type: "gradient",
@@ -16734,7 +16782,10 @@ function handleImageNode(node, params, isAnchor) {
 var handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset, anchorData, wrap$1, isAnchor, isHidden) => {
 	const wsp = graphicData.elements.find((el) => el.name === "wps:wsp");
 	const textBoxContent = wsp.elements.find((el) => el.name === "wps:txbx")?.elements?.find((el) => el.name === "w:txbxContent");
-	if ((wsp.elements.find((el) => el.name === "wps:spPr")?.elements.find((el) => el.name === "a:prstGeom"))?.attributes["prst"]) {
+	const spPr = wsp.elements.find((el) => el.name === "wps:spPr");
+	const shapeType = (spPr?.elements.find((el) => el.name === "a:prstGeom"))?.attributes["prst"];
+	const custGeom = !shapeType ? extractCustomGeometry(spPr) : null;
+	if (shapeType || custGeom) {
 		const result = getVectorShape({
 			params,
 			node,
@@ -16743,7 +16794,8 @@ var handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset
 			marginOffset,
 			anchorData,
 			wrap: wrap$1,
-			isAnchor
+			isAnchor,
+			customGeometry: custGeom
 		});
 		if (result?.attrs && isHidden) result.attrs.hidden = true;
 		if (result) return result;
@@ -16812,6 +16864,7 @@ var handleShapeGroup = (params, node, graphicData, size, padding, marginOffset,
 		const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
 		if (!spPr) return null;
 		const shapeKind = (spPr.elements?.find((el) => el.name === "a:prstGeom"))?.attributes?.["prst"];
+		const customGeom = !shapeKind ? extractCustomGeometry(spPr) : null;
 		const shapeXfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
 		const shapeOff = shapeXfrm?.elements?.find((el) => el.name === "a:off");
 		const shapeExt = shapeXfrm?.elements?.find((el) => el.name === "a:ext");
@@ -16855,6 +16908,7 @@ var handleShapeGroup = (params, node, graphicData, size, padding, marginOffset,
 			shapeType: "vectorShape",
 			attrs: {
 				kind: shapeKind,
+				customGeometry: customGeom || void 0,
 				x,
 				y,
 				width,
@@ -17081,7 +17135,7 @@ var buildShapePlaceholder = (node, size, padding, marginOffset, shapeType) => {
 		attrs
 	};
 };
-function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap$1, isAnchor }) {
+function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap$1, isAnchor, customGeometry }) {
 	const schemaAttrs = {};
 	const drawingNode = params.nodes?.[0];
 	if (drawingNode?.name === "w:drawing") schemaAttrs.drawingContent = drawingNode;
@@ -17090,8 +17144,12 @@ function getVectorShape({ params, node, graphicData, size, marginOffset, anchorD
 	const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
 	if (!spPr) return null;
 	const shapeKind = (spPr.elements?.find((el) => el.name === "a:prstGeom"))?.attributes?.["prst"];
-	if (!shapeKind) console.warn("Shape kind not found");
 	schemaAttrs.kind = shapeKind;
+	if (customGeometry) schemaAttrs.customGeometry = customGeometry;
+	else if (!shapeKind) {
+		const extracted = extractCustomGeometry(spPr);
+		if (extracted) schemaAttrs.customGeometry = extracted;
+	}
 	const width = size?.width ?? DEFAULT_SHAPE_WIDTH;
 	const height = size?.height ?? DEFAULT_SHAPE_HEIGHT;
 	const xfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
@@ -37099,7 +37157,7 @@ var SuperConverter = class SuperConverter {
 	static getStoredSuperdocVersion(docx) {
 		return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
 	}
-	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.24") {
+	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.27") {
 		return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
 	}
 	static generateWordTimestamp() {

package/dist/chunks/{SuperConverter-e9yseZkD.cjs → SuperConverter-EZm4rCaZ.cjs}

@@ -10912,6 +10912,54 @@ function extractFillColor(spPr, style) {
 	}
 	return null;
 }
+function extractCustomGeometry(spPr) {
+	const custGeom = spPr?.elements?.find((el) => el.name === "a:custGeom");
+	if (!custGeom) return null;
+	const pathLst = custGeom.elements?.find((el) => el.name === "a:pathLst");
+	if (!pathLst?.elements) return null;
+	const paths = pathLst.elements.filter((el) => el.name === "a:path").map((pathEl) => {
+		const w = parseInt(pathEl.attributes?.["w"] || "0", 10);
+		const h = parseInt(pathEl.attributes?.["h"] || "0", 10);
+		return {
+			d: convertDrawingMLPathToSvg(pathEl),
+			w,
+			h
+		};
+	}).filter((p) => p.d);
+	if (paths.length === 0) return null;
+	return { paths };
+}
+function convertDrawingMLPathToSvg(pathEl) {
+	if (!pathEl?.elements) return "";
+	const parts = [];
+	for (const cmd of pathEl.elements) switch (cmd.name) {
+		case "a:moveTo": {
+			const pt = cmd.elements?.find((el) => el.name === "a:pt");
+			if (pt) parts.push(`M ${pt.attributes?.["x"] || 0} ${pt.attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:lnTo": {
+			const pt = cmd.elements?.find((el) => el.name === "a:pt");
+			if (pt) parts.push(`L ${pt.attributes?.["x"] || 0} ${pt.attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:cubicBezTo": {
+			const pts = cmd.elements?.filter((el) => el.name === "a:pt") || [];
+			if (pts.length === 3) parts.push(`C ${pts[0].attributes?.["x"] || 0} ${pts[0].attributes?.["y"] || 0} ${pts[1].attributes?.["x"] || 0} ${pts[1].attributes?.["y"] || 0} ${pts[2].attributes?.["x"] || 0} ${pts[2].attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:quadBezTo": {
+			const pts = cmd.elements?.filter((el) => el.name === "a:pt") || [];
+			if (pts.length === 2) parts.push(`Q ${pts[0].attributes?.["x"] || 0} ${pts[0].attributes?.["y"] || 0} ${pts[1].attributes?.["x"] || 0} ${pts[1].attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:close":
+			parts.push("Z");
+			break;
+		default: break;
+	}
+	return parts.join(" ");
+}
 function extractGradientFill(gradFill) {
 	const gradient = {
 		type: "gradient",
@@ -16745,7 +16793,10 @@ function handleImageNode(node, params, isAnchor) {
 var handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset, anchorData, wrap$1, isAnchor, isHidden) => {
 	const wsp = graphicData.elements.find((el) => el.name === "wps:wsp");
 	const textBoxContent = wsp.elements.find((el) => el.name === "wps:txbx")?.elements?.find((el) => el.name === "w:txbxContent");
-	if ((wsp.elements.find((el) => el.name === "wps:spPr")?.elements.find((el) => el.name === "a:prstGeom"))?.attributes["prst"]) {
+	const spPr = wsp.elements.find((el) => el.name === "wps:spPr");
+	const shapeType = (spPr?.elements.find((el) => el.name === "a:prstGeom"))?.attributes["prst"];
+	const custGeom = !shapeType ? extractCustomGeometry(spPr) : null;
+	if (shapeType || custGeom) {
 		const result = getVectorShape({
 			params,
 			node,
@@ -16754,7 +16805,8 @@ var handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset
 			marginOffset,
 			anchorData,
 			wrap: wrap$1,
-			isAnchor
+			isAnchor,
+			customGeometry: custGeom
 		});
 		if (result?.attrs && isHidden) result.attrs.hidden = true;
 		if (result) return result;
@@ -16823,6 +16875,7 @@ var handleShapeGroup = (params, node, graphicData, size, padding, marginOffset,
 		const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
 		if (!spPr) return null;
 		const shapeKind = (spPr.elements?.find((el) => el.name === "a:prstGeom"))?.attributes?.["prst"];
+		const customGeom = !shapeKind ? extractCustomGeometry(spPr) : null;
 		const shapeXfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
 		const shapeOff = shapeXfrm?.elements?.find((el) => el.name === "a:off");
 		const shapeExt = shapeXfrm?.elements?.find((el) => el.name === "a:ext");
@@ -16866,6 +16919,7 @@ var handleShapeGroup = (params, node, graphicData, size, padding, marginOffset,
 			shapeType: "vectorShape",
 			attrs: {
 				kind: shapeKind,
+				customGeometry: customGeom || void 0,
 				x,
 				y,
 				width,
@@ -17092,7 +17146,7 @@ var buildShapePlaceholder = (node, size, padding, marginOffset, shapeType) => {
 		attrs
 	};
 };
-function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap$1, isAnchor }) {
+function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap$1, isAnchor, customGeometry }) {
 	const schemaAttrs = {};
 	const drawingNode = params.nodes?.[0];
 	if (drawingNode?.name === "w:drawing") schemaAttrs.drawingContent = drawingNode;
@@ -17101,8 +17155,12 @@ function getVectorShape({ params, node, graphicData, size, marginOffset, anchorD
 	const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
 	if (!spPr) return null;
 	const shapeKind = (spPr.elements?.find((el) => el.name === "a:prstGeom"))?.attributes?.["prst"];
-	if (!shapeKind) console.warn("Shape kind not found");
 	schemaAttrs.kind = shapeKind;
+	if (customGeometry) schemaAttrs.customGeometry = customGeometry;
+	else if (!shapeKind) {
+		const extracted = extractCustomGeometry(spPr);
+		if (extracted) schemaAttrs.customGeometry = extracted;
+	}
 	const width = size?.width ?? DEFAULT_SHAPE_WIDTH;
 	const height = size?.height ?? DEFAULT_SHAPE_HEIGHT;
 	const xfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
@@ -37119,7 +37177,7 @@ var SuperConverter = class SuperConverter {
 	static getStoredSuperdocVersion(docx) {
 		return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
 	}
-	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.24") {
+	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.27") {
 		return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
 	}
 	static generateWordTimestamp() {

package/dist/chunks/{src-DDnXuxKk.es.js → src-BR5TDS4t.es.js}

@@ -1,5 +1,5 @@
 import { a as __toCommonJS, n as __esmMin, r as __export, t as __commonJSMin } from "./rolldown-runtime-B2q5OVn9.es.js";
-import { $ as Selection, A as findChildren$1, At as DOMSerializer, B as findParentNode, C as calculateResolvedParagraphProperties, Ct as resolveTableCellProperties, D as CommandService, Dt as TrackInsertMarkName, E as generateOrderedListIndex, Et as TrackFormatMarkName, F as isNodeActive, Ft as minMax, G as cleanSchemaItem, H as defaultBlockAt$1, I as getSchemaTypeNameByName, It as callOrGet, J as AllSelection, K as getSchemaTypeByName, L as isMarkActive, Lt as getExtensionConfigField, M as findMark, Mt as Mark$1, N as getMarksFromSelection, Nt as Schema$1, O as isInTable, Ot as carbonCopy, P as isActive, Pt as Slice, Q as PluginKey, R as getMarkRange, S as isList, St as resolveRunProperties, T as docxNumberingHelpers, Tt as TrackDeleteMarkName, U as getMarkType, V as findParentNodeClosestToPos, W as getNodeType, X as NodeSelection, Y as EditorState, Z as Plugin, _ as inputRulesPlugin, _t as encodeCSSFromPPr, a as translator, at as ReplaceAroundStep$1, b as changeListLevel, bt as resolveDocxFontFamily, c as updateDOMAttributes, ct as canJoin, d as markdownToPmFragment, dt as joinPoint, et as SelectionRange, f as createDocFromHTML, ft as liftTarget, g as htmlHandler, gt as decodeRPrFromMarks, h as handleClipboardPaste, ht as generateRandomSigned32BitIntStrId, it as RemoveMarkStep, j as getActiveFormatting, jt as Fragment$1, k as posToDOMRect, kt as DOMParser$1, l as processContent, lt as canSplit, m as InputRule, mt as generateDocxRandomId, n as kebabCase$1, nt as AddMarkStep, o as _getReferencedTableStyles, ot as ReplaceStep, p as createCellBorders, pt as replaceStep$1, q as createDocument, r as insertNewRelationship, rt as Mapping, s as helpers_exports, st as Transform, t as SuperConverter, tt as TextSelection$1, u as createDocFromMarkdown, ut as dropPoint, v as unflattenListsInHtml, vt as encodeCSSFromRPr, w as getResolvedParagraphProperties, wt as getUnderlineCssString, x as updateNumberingProperties, xt as resolveParagraphProperties, y as ListHelpers, yt as encodeMarksFromRPr, z as isTextSelection } from "./SuperConverter-Dpef8fg5.es.js";
+import { $ as Selection, A as findChildren$1, At as DOMSerializer, B as findParentNode, C as calculateResolvedParagraphProperties, Ct as resolveTableCellProperties, D as CommandService, Dt as TrackInsertMarkName, E as generateOrderedListIndex, Et as TrackFormatMarkName, F as isNodeActive, Ft as minMax, G as cleanSchemaItem, H as defaultBlockAt$1, I as getSchemaTypeNameByName, It as callOrGet, J as AllSelection, K as getSchemaTypeByName, L as isMarkActive, Lt as getExtensionConfigField, M as findMark, Mt as Mark$1, N as getMarksFromSelection, Nt as Schema$1, O as isInTable, Ot as carbonCopy, P as isActive, Pt as Slice, Q as PluginKey, R as getMarkRange, S as isList, St as resolveRunProperties, T as docxNumberingHelpers, Tt as TrackDeleteMarkName, U as getMarkType, V as findParentNodeClosestToPos, W as getNodeType, X as NodeSelection, Y as EditorState, Z as Plugin, _ as inputRulesPlugin, _t as encodeCSSFromPPr, a as translator, at as ReplaceAroundStep$1, b as changeListLevel, bt as resolveDocxFontFamily, c as updateDOMAttributes, ct as canJoin, d as markdownToPmFragment, dt as joinPoint, et as SelectionRange, f as createDocFromHTML, ft as liftTarget, g as htmlHandler, gt as decodeRPrFromMarks, h as handleClipboardPaste, ht as generateRandomSigned32BitIntStrId, it as RemoveMarkStep, j as getActiveFormatting, jt as Fragment$1, k as posToDOMRect, kt as DOMParser$1, l as processContent, lt as canSplit, m as InputRule, mt as generateDocxRandomId, n as kebabCase$1, nt as AddMarkStep, o as _getReferencedTableStyles, ot as ReplaceStep, p as createCellBorders, pt as replaceStep$1, q as createDocument, r as insertNewRelationship, rt as Mapping, s as helpers_exports, st as Transform, t as SuperConverter, tt as TextSelection$1, u as createDocFromMarkdown, ut as dropPoint, v as unflattenListsInHtml, vt as encodeCSSFromRPr, w as getResolvedParagraphProperties, wt as getUnderlineCssString, x as updateNumberingProperties, xt as resolveParagraphProperties, y as ListHelpers, yt as encodeMarksFromRPr, z as isTextSelection } from "./SuperConverter-B_fGJA0T.es.js";
 import { a as init_dist$2, i as global, n as init_dist, o as Buffer$3, r as process$1, s as init_dist$1 } from "./jszip-ChlR43oI.es.js";
 import { t as v4_default } from "./uuid-2IzDu5nl.es.js";
 import { A as ptToTwips, D as pixelsToTwips, F as twipsToInches, I as twipsToLines, L as twipsToPixels, S as linesToTwips, b as inchesToTwips, c as convertSizeToCSS, j as resolveOpcTargetPath, m as getArrayBufferFromUrl, t as COMMENT_FILE_BASENAMES, v as halfPointToPoints, y as inchesToPixels } from "./constants-Dw0kAsLd.es.js";
@@ -260,7 +260,7 @@ var v_click_outside_default = {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "1.17.0-next.24";
+		return "1.17.0-next.27";
 	} catch {
 		return "unknown";
 	}
@@ -19443,11 +19443,27 @@ const AnnotatorHelpers = {
 	annotateHeadersAndFooters,
 	getAllHeaderFooterEditors
 };
-const updateYdocDocxData = async (editor, ydoc) => {
+var inFlightUpdates = /* @__PURE__ */ new WeakMap();
+const updateYdocDocxData = (editor, ydoc) => {
+	ydoc = ydoc || editor?.options?.ydoc;
+	if (!ydoc || ydoc.isDestroyed) return Promise.resolve();
+	if (!editor || editor.isDestroyed) return Promise.resolve();
+	let ydocMap = inFlightUpdates.get(editor);
+	if (!ydocMap) {
+		ydocMap = /* @__PURE__ */ new WeakMap();
+		inFlightUpdates.set(editor, ydocMap);
+	}
+	const existing = ydocMap.get(ydoc);
+	if (existing) return existing;
+	const promise = _doUpdateYdocDocxData(editor, ydoc).finally(() => {
+		const map$2 = inFlightUpdates.get(editor);
+		if (map$2 && map$2.get(ydoc) === promise) map$2.delete(ydoc);
+	});
+	ydocMap.set(ydoc, promise);
+	return promise;
+};
+var _doUpdateYdocDocxData = async (editor, ydoc) => {
 	try {
-		ydoc = ydoc || editor?.options?.ydoc;
-		if (!ydoc || ydoc.isDestroyed) return;
-		if (!editor || editor.isDestroyed) return;
 		const metaMap = ydoc.getMap("meta");
 		const docxValue = metaMap.get("docx");
 		let docx = [];
@@ -19633,10 +19649,16 @@ var checkDocxChanged = (transaction) => {
 	for (const [, value] of transaction.changed.entries()) if (value instanceof Set && value.has("docx")) return true;
 	return false;
 };
+var debouncedDocxUpdateByEditor = /* @__PURE__ */ new WeakMap();
+const cancelDebouncedDocxUpdate = (editor) => {
+	const cancel = debouncedDocxUpdateByEditor.get(editor);
+	if (cancel) cancel();
+};
 var initDocumentListener = ({ ydoc, editor }) => {
 	const debouncedUpdate = debounce$2((editor$1) => {
 		updateYdocDocxData(editor$1);
 	}, 3e4, { maxWait: 6e4 });
+	debouncedDocxUpdateByEditor.set(editor, () => debouncedUpdate.cancel());
 	const afterTransactionHandler = (transaction) => {
 		const { local } = transaction;
 		if (!checkDocxChanged(transaction) && transaction.changed?.size && local) debouncedUpdate(editor);
@@ -19645,6 +19667,7 @@ var initDocumentListener = ({ ydoc, editor }) => {
 	return () => {
 		ydoc.off("afterTransaction", afterTransactionHandler);
 		debouncedUpdate.cancel();
+		debouncedDocxUpdateByEditor.delete(editor);
 	};
 };
 var debounce$2 = (fn, wait, { maxWait } = {}) => {
@@ -20756,7 +20779,7 @@ const canUseDOM = () => {
 		return false;
 	}
 };
-var summaryVersion = "1.17.0-next.24";
+var summaryVersion = "1.17.0-next.27";
 var nodeKeys = [
 	"group",
 	"content",
@@ -35471,7 +35494,7 @@ var Editor = class Editor extends EventEmitter$1 {
 		return migrations.length > 0;
 	}
 	processCollaborationMigrations() {
-		console.debug("[checkVersionMigrations] Current editor version", "1.17.0-next.24");
+		console.debug("[checkVersionMigrations] Current editor version", "1.17.0-next.27");
 		if (!this.options.ydoc) return;
 		let docVersion = this.options.ydoc.getMap("meta").get("version");
 		if (!docVersion) docVersion = "initial";
@@ -35505,7 +35528,8 @@ var Editor = class Editor extends EventEmitter$1 {
 		this.#initMedia();
 		this.initDefaultStyles();
 		if (this.options.ydoc && this.options.collaborationProvider) {
-			updateYdocDocxData(this, this.options.ydoc);
+			cancelDebouncedDocxUpdate(this);
+			await updateYdocDocxData(this, this.options.ydoc);
 			this.initializeCollaborationData();
 		} else this.#insertNewFileData();
 		if (!this.options.ydoc) this.#initComments();
@@ -43864,7 +43888,8 @@ async function measureDrawingBlock(block, constraints) {
 	const rotatedBounds = calculateRotatedBounds(geometry);
 	const naturalWidth = Math.max(1, rotatedBounds.width);
 	const naturalHeight = Math.max(1, rotatedBounds.height);
-	const maxWidth = fullWidthMax ?? (constraints.maxWidth > 0 ? constraints.maxWidth : naturalWidth);
+	const isFloating = block.wrap?.type === "None";
+	const maxWidth = fullWidthMax ?? (constraints.maxWidth > 0 && !isFloating ? constraints.maxWidth : naturalWidth);
 	const maxHeight = block.anchor?.isAnchored && (typeof block.anchor?.offsetV === "number" && block.anchor.offsetV < 0 || typeof block.margin?.top === "number" && block.margin.top < 0) || !constraints.maxHeight || constraints.maxHeight <= 0 ? Infinity : constraints.maxHeight;
 	const widthScale = maxWidth / naturalWidth;
 	const heightScale = maxHeight / naturalHeight;
@@ -51306,9 +51331,11 @@ var DomPainter = class DomPainter {
 		contentContainer.style.top = `${offsetY}px`;
 		contentContainer.style.width = `${innerWidth}px`;
 		contentContainer.style.height = `${innerHeight$1}px`;
-		const svgMarkup = block.shapeKind ? this.tryCreatePresetSvg(block, innerWidth, innerHeight$1) : null;
-		if (svgMarkup) {
-			const svgElement = this.parseSafeSvg(svgMarkup);
+		const customGeomSvg = block.customGeometry ? this.tryCreateCustomGeometrySvg(block, innerWidth, innerHeight$1) : null;
+		const svgMarkup = !customGeomSvg && block.shapeKind ? this.tryCreatePresetSvg(block, innerWidth, innerHeight$1) : null;
+		const resolvedSvgMarkup = customGeomSvg || svgMarkup;
+		if (resolvedSvgMarkup) {
+			const svgElement = this.parseSafeSvg(resolvedSvgMarkup);
 			if (svgElement) {
 				svgElement.setAttribute("width", "100%");
 				svgElement.setAttribute("height", "100%");
@@ -51376,14 +51403,6 @@ var DomPainter = class DomPainter {
 		textDiv.style.minWidth = "0";
 		textDiv.style.fontSize = "12px";
 		textDiv.style.lineHeight = "1.2";
-		if (groupScaleX !== 1 || groupScaleY !== 1) {
-			const counterScaleX = 1 / groupScaleX;
-			const counterScaleY = 1 / groupScaleY;
-			textDiv.style.transform = `scale(${counterScaleX}, ${counterScaleY})`;
-			textDiv.style.transformOrigin = "top left";
-			textDiv.style.width = `${100 * groupScaleX}%`;
-			textDiv.style.height = `${100 * groupScaleY}%`;
-		}
 		if (textAlign === "center") textDiv.style.textAlign = "center";
 		else if (textAlign === "right" || textAlign === "r") textDiv.style.textAlign = "right";
 		else textDiv.style.textAlign = "left";
@@ -51452,6 +51471,33 @@ var DomPainter = class DomPainter {
 			return null;
 		}
 	}
+	tryCreateCustomGeometrySvg(block, width, height) {
+		const custGeom = block.customGeometry;
+		if (!custGeom?.paths?.length) return null;
+		let fillColor;
+		if (block.fillColor === null) fillColor = "none";
+		else if (typeof block.fillColor === "string") fillColor = block.fillColor;
+		else fillColor = "#000000";
+		const strokeColor = block.strokeColor === null ? "none" : typeof block.strokeColor === "string" ? block.strokeColor : "none";
+		const strokeWidth = block.strokeColor === null ? 0 : block.strokeWidth ?? 0;
+		const firstPath = custGeom.paths[0];
+		const viewW = firstPath.w || width;
+		const viewH = firstPath.h || height;
+		if (viewW === 0 || viewH === 0) return null;
+		const edgeStroke = fillColor !== "none" && strokeColor === "none" ? ` stroke="${fillColor}" stroke-width="0.5" vector-effect="non-scaling-stroke"` : "";
+		return `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}" viewBox="0 0 ${viewW} ${viewH}" preserveAspectRatio="none">
+  ${custGeom.paths.map((p$1) => {
+			const pathW = p$1.w || viewW;
+			const pathH = p$1.h || viewH;
+			const needsTransform = pathW !== viewW || pathH !== viewH;
+			const scaleX = viewW / pathW;
+			const scaleY = viewH / pathH;
+			const transform = needsTransform ? ` transform="scale(${scaleX}, ${scaleY})"` : "";
+			const strokeAttr = strokeColor !== "none" ? ` stroke="${strokeColor}" stroke-width="${strokeWidth}"` : edgeStroke;
+			return `<path d="${p$1.d}" fill="${fillColor}" fill-rule="evenodd"${strokeAttr}${transform} />`;
+		}).join("\n  ")}
+</svg>`;
+	}
 	parseSafeSvg(markup) {
 		const DOMParserCtor = this.doc?.defaultView?.DOMParser ?? (typeof DOMParser !== "undefined" ? DOMParser : null);
 		if (!DOMParserCtor) return null;
@@ -51599,41 +51645,31 @@ var DomPainter = class DomPainter {
 		groupEl.style.height = "100%";
 		const groupTransform = block.groupTransform;
 		let contentContainer = groupEl;
-		const groupScaleX = 1;
-		const groupScaleY = 1;
+		const visibleWidth = groupTransform?.width ?? block.geometry.width ?? 0;
+		const visibleHeight = groupTransform?.height ?? block.geometry.height ?? 0;
 		if (groupTransform) {
 			const inner = this.doc.createElement("div");
 			inner.style.position = "absolute";
 			inner.style.left = "0";
 			inner.style.top = "0";
-			const childWidth = groupTransform.childWidth ?? groupTransform.width ?? block.geometry.width ?? 0;
-			const childHeight = groupTransform.childHeight ?? groupTransform.height ?? block.geometry.height ?? 0;
-			inner.style.width = `${Math.max(1, childWidth)}px`;
-			inner.style.height = `${Math.max(1, childHeight)}px`;
-			const transforms = [];
-			const offsetX = groupTransform.childX ?? 0;
-			const offsetY = groupTransform.childY ?? 0;
-			if (offsetX || offsetY) transforms.push(`translate(${-offsetX}px, ${-offsetY}px)`);
-			if (transforms.length > 0) {
-				inner.style.transformOrigin = "top left";
-				inner.style.transform = transforms.join(" ");
-			}
+			inner.style.width = `${Math.max(1, visibleWidth)}px`;
+			inner.style.height = `${Math.max(1, visibleHeight)}px`;
 			groupEl.appendChild(inner);
 			contentContainer = inner;
 		}
 		block.shapes.forEach((child) => {
-			const childContent = this.createGroupChildContent(child, groupScaleX, groupScaleY, context);
+			const childContent = this.createGroupChildContent(child, 1, 1, context);
 			if (!childContent) return;
 			const attrs = child.attrs ?? {};
 			const wrapper = this.doc.createElement("div");
 			wrapper.classList.add("superdoc-shape-group__child");
 			wrapper.style.position = "absolute";
-			wrapper.style.left = `${attrs.x ?? 0}px`;
-			wrapper.style.top = `${attrs.y ?? 0}px`;
-			const childWidthValue = typeof attrs.width === "number" ? attrs.width : block.geometry.width;
-			const childHeightValue = typeof attrs.height === "number" ? attrs.height : block.geometry.height;
-			wrapper.style.width = `${Math.max(1, childWidthValue)}px`;
-			wrapper.style.height = `${Math.max(1, childHeightValue)}px`;
+			wrapper.style.left = `${Number(attrs.x ?? 0)}px`;
+			wrapper.style.top = `${Number(attrs.y ?? 0)}px`;
+			const childW = typeof attrs.width === "number" ? attrs.width : block.geometry.width;
+			const childH = typeof attrs.height === "number" ? attrs.height : block.geometry.height;
+			wrapper.style.width = `${Math.max(1, childW)}px`;
+			wrapper.style.height = `${Math.max(1, childH)}px`;
 			wrapper.style.transformOrigin = "center";
 			const transforms = [];
 			if (attrs.rotation) transforms.push(`rotate(${attrs.rotation}deg)`);
@@ -51670,6 +51706,7 @@ var DomPainter = class DomPainter {
 				drawingContentId: void 0,
 				drawingContent: void 0,
 				shapeKind: attrs.kind,
+				customGeometry: attrs.customGeometry,
 				fillColor: attrs.fillColor,
 				strokeColor: attrs.strokeColor,
 				strokeWidth: attrs.strokeWidth,
@@ -55924,11 +55961,8 @@ var NotInlineNodeError = class extends Error {
 const applyInlineRunProperties = (run, runProperties, converterContext) => {
 	if (!runProperties) return run;
 	const runAttrs = computeRunAttrs(runProperties, converterContext);
-	const merged = {
-		...run,
-		...runAttrs
-	};
-	if (runAttrs.color === void 0 && run.color !== void 0) merged.color = run.color;
+	const merged = { ...run };
+	for (const key$1 of Object.keys(runAttrs)) if (runAttrs[key$1] !== void 0) merged[key$1] = runAttrs[key$1];
 	return merged;
 };
 function textNodeToRun({ node, positions, defaultFont, defaultSize, inheritedMarks = [], sdtMetadata, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, enableComments, runProperties, converterContext }) {
@@ -57012,6 +57046,7 @@ const buildDrawingBlock = (rawAttrs, nextBlockId, positions, node, geometry, dra
 		attrs: attrsWithPm,
 		geometry,
 		shapeKind: typeof rawAttrs.kind === "string" ? rawAttrs.kind : void 0,
+		customGeometry: rawAttrs.customGeometry != null ? rawAttrs.customGeometry : void 0,
 		fillColor: normalizeFillColor(rawAttrs.fillColor),
 		strokeColor: normalizeStrokeColor(rawAttrs.strokeColor),
 		strokeWidth: coerceNumber(rawAttrs.strokeWidth),
@@ -73676,13 +73711,13 @@ var buildWrapTransaction = (state, ranges, runType, editor, markDefsFromMeta = [
 	const metaStyleMarks = createMarksFromDefs(state.schema, markDefsFromMeta);
 	ranges.forEach(({ from: from$1, to }) => {
 		state.doc.nodesBetween(from$1, to, (node, pos, parent, index) => {
-			if (!node.isText || !parent || parent.type === runType || parent.type?.name === "structuredContent") return;
+			if (!node.isText || !parent || parent.type === runType) return;
 			const match$1 = parent.contentMatchAt ? parent.contentMatchAt(index) : null;
 			if (match$1 && !match$1.matchType(runType)) return;
 			if (!match$1 && !parent.type.contentMatch.matchType(runType)) return;
 			let runProperties;
 			let textNode = node;
-			if (index === 0) ({runProperties, textNode} = copyRunPropertiesFromPreviousParagraph(state, pos, textNode, runType, editor));
+			if (index === 0 && parent.type.name === "paragraph") ({runProperties, textNode} = copyRunPropertiesFromPreviousParagraph(state, pos, textNode, runType, editor));
 			if (metaStyleMarks.length) {
 				const mergedMarks = metaStyleMarks.reduce((set, mark) => mark.addToSet(set), textNode.marks);
 				textNode = textNode.mark(mergedMarks);
@@ -80733,6 +80768,10 @@ const VectorShape = Node$1.create({
 					return { "data-stroke-width": attrs.strokeWidth };
 				}
 			},
+			customGeometry: {
+				default: null,
+				rendered: false
+			},
 			lineEnds: {
 				default: null,
 				rendered: false
@@ -80926,7 +80965,8 @@ var ShapeGroupView = class {
 		if (attrs.flipH) transforms.push(`scale(-1, 1) translate(${-width}, 0)`);
 		if (attrs.flipV) transforms.push(`scale(1, -1) translate(0, ${-height})`);
 		if (transforms.length > 0) g$1.setAttribute("transform", transforms.join(" "));
-		const shapeKind = attrs.kind || "rect";
+		const shapeKind = attrs.kind;
+		const customGeometry = attrs.customGeometry;
 		const fillColor = attrs.fillColor === null ? null : attrs.fillColor ?? "#5b9bd5";
 		const strokeColor = attrs.strokeColor === null ? null : attrs.strokeColor ?? "#000000";
 		const strokeWidth = attrs.strokeWidth ?? 1;
@@ -80965,9 +81005,65 @@ var ShapeGroupView = class {
 			}
 			return g$1;
 		}
+		if (customGeometry?.paths?.length) {
+			const fillStr = fillValue === null ? "none" : typeof fillValue === "string" ? fillValue : "none";
+			const strokeStr = strokeColor === null ? "none" : strokeColor;
+			const strokeW = strokeColor === null ? 0 : strokeWidth;
+			const firstPath = customGeometry.paths[0];
+			const viewW = firstPath.w || width;
+			const viewH = firstPath.h || height;
+			if (viewW > 0 && viewH > 0) {
+				const needsEdgeStroke = fillStr !== "none" && strokeStr === "none";
+				const innerSvg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+				innerSvg.setAttribute("x", "0");
+				innerSvg.setAttribute("y", "0");
+				innerSvg.setAttribute("width", width.toString());
+				innerSvg.setAttribute("height", height.toString());
+				innerSvg.setAttribute("viewBox", `0 0 ${viewW} ${viewH}`);
+				innerSvg.setAttribute("preserveAspectRatio", "none");
+				for (const pathData of customGeometry.paths) {
+					const pathEl = document.createElementNS("http://www.w3.org/2000/svg", "path");
+					pathEl.setAttribute("d", pathData.d);
+					pathEl.setAttribute("fill", fillStr);
+					pathEl.setAttribute("fill-rule", "evenodd");
+					if (strokeStr !== "none") {
+						pathEl.setAttribute("stroke", strokeStr);
+						pathEl.setAttribute("stroke-width", strokeW.toString());
+					} else if (needsEdgeStroke) {
+						pathEl.setAttribute("stroke", fillStr);
+						pathEl.setAttribute("stroke-width", "0.5");
+						pathEl.setAttribute("vector-effect", "non-scaling-stroke");
+					} else {
+						pathEl.setAttribute("stroke", "none");
+						pathEl.setAttribute("stroke-width", "0");
+					}
+					const pathW = pathData.w || viewW;
+					const pathH = pathData.h || viewH;
+					if (pathW !== viewW || pathH !== viewH) {
+						const scaleX = viewW / pathW;
+						const scaleY = viewH / pathH;
+						pathEl.setAttribute("transform", `scale(${scaleX}, ${scaleY})`);
+					}
+					innerSvg.appendChild(pathEl);
+				}
+				g$1.appendChild(innerSvg);
+			}
+			if (attrs.textContent && attrs.textContent.parts) {
+				const pageNumber = this.editor?.options?.currentPageNumber;
+				const totalPages = this.editor?.options?.totalPageCount;
+				const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height, {
+					textVerticalAlign: attrs.textVerticalAlign,
+					textInsets: attrs.textInsets,
+					pageNumber,
+					totalPages
+				});
+				if (textGroup) g$1.appendChild(textGroup);
+			}
+			return g$1;
+		}
 		try {
 			const svgContent = k0({
-				preset: shapeKind,
+				preset: shapeKind || "rect",
 				styleOverrides: {
 					fill: fillValue || "none",
 					stroke: strokeColor === null ? "none" : strokeColor,