@harbour-enterprises/superdoc 1.0.0-beta.40 → 1.0.0-beta.54

package/dist/super-editor/chunks/{converter-D6IUdu7s.js → converter-OoT4LYwQ.js}

@@ -18031,7 +18031,7 @@ const attrConfig$r = Object.freeze({
   encode: encode$Q,
   decode: decode$S
 });
-const validXmlAttributes$j = [attrConfig$s, attrConfig$r];
+const validXmlAttributes$h = [attrConfig$s, attrConfig$r];
 const XML_NODE_NAME$q = "w:br";
 const SD_NODE_NAME$k = "lineBreak";
 const encode$P = (_2, encodedAttrs) => {
@@ -18067,7 +18067,7 @@ const config$p = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$P,
   decode: decode$R,
-  attributes: validXmlAttributes$j
+  attributes: validXmlAttributes$h
 };
 const translator$23 = NodeTranslator.from(config$p);
 const encode$O = (attributes) => attributes?.["w:val"];
@@ -18078,7 +18078,7 @@ const attrConfig$q = Object.freeze({
   encode: encode$O,
   decode: decode$Q
 });
-const validXmlAttributes$i = [attrConfig$q];
+const validXmlAttributes$g = [attrConfig$q];
 const XML_NODE_NAME$p = "w:highlight";
 const SD_ATTR_KEY$4 = "highlight";
 const DISABLED_TOKENS = /* @__PURE__ */ new Set(["transparent", "none", "inherit"]);
@@ -18129,7 +18129,7 @@ const config$o = {
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
   encode: encode$N,
   decode: decode$P,
-  attributes: validXmlAttributes$i
+  attributes: validXmlAttributes$g
 };
 const translator$22 = NodeTranslator.from(config$o);
 const encode$M = (attributes) => {
@@ -18172,7 +18172,7 @@ const attrConfig$n = Object.freeze({
   encode: encode$K,
   decode: decode$M
 });
-const validXmlAttributes$h = [attrConfig$p, attrConfig$n, attrConfig$o];
+const validXmlAttributes$f = [attrConfig$p, attrConfig$n, attrConfig$o];
 const XML_NODE_NAME$o = "w:tab";
 const SD_NODE_NAME$j = "tab";
 const encode$J = (_2, encodedAttrs = {}) => {
@@ -18208,7 +18208,7 @@ const config$n = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$J,
   decode: decode$L,
-  attributes: validXmlAttributes$h
+  attributes: validXmlAttributes$f
 };
 const translator$21 = NodeTranslator.from(config$n);
 const carbonCopy = (obj) => {
@@ -18579,7 +18579,7 @@ const attrConfig$i = Object.freeze({
   encode: encode$E,
   decode: decode$G
 });
-const validXmlAttributes$g = [attrConfig$m, attrConfig$l, attrConfig$k, attrConfig$j, attrConfig$i];
+const validXmlAttributes$e = [attrConfig$m, attrConfig$l, attrConfig$k, attrConfig$j, attrConfig$i];
 const XML_NODE_NAME$n = "w:u";
 const SD_ATTR_KEY$3 = "underline";
 const encode$D = (params, encodedAttrs = {}) => {
@@ -18631,7 +18631,7 @@ const config$m = {
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
   encode: encode$D,
   decode: decode$F,
-  attributes: validXmlAttributes$g
+  attributes: validXmlAttributes$e
 };
 const translator$1Z = NodeTranslator.from(config$m);
 const translator$1Y = NodeTranslator.from(createSingleBooleanPropertyHandler("w:strike"));
@@ -18765,7 +18765,7 @@ const SUPPORTED_ALTERNATE_CONTENT_REQUIRES = /* @__PURE__ */ new Set([
 ]);
 const XML_NODE_NAME$m = "mc:AlternateContent";
 const SD_NODE_NAME$i = [];
-const validXmlAttributes$f = [];
+const validXmlAttributes$d = [];
 function encode$C(params) {
   const { nodeListHandler } = params;
   const { node } = params.extraParams;
@@ -18805,7 +18805,7 @@ const config$l = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$C,
   decode: decode$E,
-  attributes: validXmlAttributes$f
+  attributes: validXmlAttributes$d
 };
 function selectAlternateContentElements(node) {
   if (!node?.elements?.length) {
@@ -18945,7 +18945,7 @@ const createTrackStyleMark = (marks) => {
 };
 const XML_NODE_NAME$l = "w:ins";
 const SD_ATTR_KEY$2 = "trackInsert";
-const validXmlAttributes$e = [
+const validXmlAttributes$c = [
   createAttributeHandler("w:id", "id"),
   createAttributeHandler("w:date", "date"),
   createAttributeHandler("w:author", "author"),
@@ -19005,7 +19005,7 @@ const config$k = {
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
   encode: encode$B,
   decode: decode$D,
-  attributes: validXmlAttributes$e
+  attributes: validXmlAttributes$c
 };
 const translator$1w = NodeTranslator.from(config$k);
 const translator$1v = NodeTranslator.from(createSingleIntegerPropertyHandler("w:numId"));
@@ -19199,11 +19199,12 @@ const resolveRunProperties = (params, inlineRpr, resolvedPpr, isListNumber = fal
   }
   if (isListNumber) {
     let numberingProps = {};
-    if (resolvedPpr?.numberingProperties?.numId != null) {
+    const numId = resolvedPpr?.numberingProperties?.numId;
+    if (numId != null && numId !== 0 && numId !== "0") {
       numberingProps = getNumberingProperties(
         params,
         resolvedPpr.numberingProperties.ilvl ?? 0,
-        resolvedPpr.numberingProperties.numId,
+        numId,
         translator$1N
       );
     }
@@ -19241,9 +19242,13 @@ function resolveParagraphProperties(params, inlineProps, insideTable = false, ov
   let styleProps = inlineProps?.styleId ? resolveStyleChain(params, inlineProps?.styleId, translator$12) : {};
   let numberingProps = {};
   let ilvl = inlineProps?.numberingProperties?.ilvl ?? styleProps?.numberingProperties?.ilvl;
-  const numId = inlineProps?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
+  let numId = inlineProps?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
   let numberingDefinedInline = inlineProps?.numberingProperties?.numId != null;
-  const isList2 = numId != null;
+  const inlineNumIdDisablesNumbering = inlineProps?.numberingProperties?.numId === 0 || inlineProps?.numberingProperties?.numId === "0";
+  if (inlineNumIdDisablesNumbering) {
+    numId = null;
+  }
+  const isList2 = numId != null && numId !== 0 && numId !== "0";
   if (isList2) {
     ilvl = ilvl != null ? ilvl : 0;
     numberingProps = getNumberingProperties(params, ilvl, numId, translator$12);
@@ -20384,7 +20389,7 @@ const attrConfig$b = Object.freeze({
   encode: encode$u,
   decode: decode$w
 });
-const validXmlAttributes$d = [
+const validXmlAttributes$b = [
   attrConfig$c,
   attrConfig$b,
   attrConfig$f,
@@ -20417,7 +20422,7 @@ const config$j = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$t,
   decode: decode$v,
-  attributes: validXmlAttributes$d
+  attributes: validXmlAttributes$b
 };
 const translator$11 = NodeTranslator.from(config$j);
 const EAST_ASIAN_CHARACTER_REGEX = /[\u1100-\u11FF\u2E80-\u2EFF\u2F00-\u2FDF\u3040-\u30FF\u3100-\u312F\u3130-\u318F\u31A0-\u31BF\u3400-\u4DBF\u4E00-\u9FFF\uA960-\uA97F\uAC00-\uD7AF\uF900-\uFAFF\uFF00-\uFFEF]/u;
@@ -20600,7 +20605,7 @@ const _createAttributeHandler = (xmlName, sdName) => ({
   encode: (attributes) => attributes[xmlName],
   decode: (attributes) => attributes[sdName]
 });
-const validXmlAttributes$c = [
+const validXmlAttributes$a = [
   _createAttributeHandler("w:anchor", "anchor"),
   _createAttributeHandler("w:docLocation", "docLocation"),
   {
@@ -20702,7 +20707,7 @@ const config$i = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$s,
   decode: decode$u,
-  attributes: validXmlAttributes$c
+  attributes: validXmlAttributes$a
 };
 const translator$10 = NodeTranslator.from(config$i);
 const encode$r = (attributes) => {
@@ -20741,7 +20746,7 @@ const attrConfig$8 = Object.freeze({
   encode: encode$p,
   decode: decode$r
 });
-const validXmlAttributes$b = [attrConfig$a, attrConfig$9, attrConfig$8];
+const validXmlAttributes$9 = [attrConfig$a, attrConfig$9, attrConfig$8];
 const XML_NODE_NAME$i = "w:r";
 const SD_KEY_NAME = "run";
 const encode$o = (params, encodedAttrs = {}) => {
@@ -20888,7 +20893,7 @@ const config$h = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$o,
   decode: decode$q,
-  attributes: validXmlAttributes$b
+  attributes: validXmlAttributes$9
 };
 const translator$$ = NodeTranslator.from(config$h);
 const translator$_ = NodeTranslator.from(createMeasurementPropertyHandler("w:tcW", "cellWidth"));
@@ -21318,7 +21323,7 @@ function generateTableCellProperties(node) {
 }
 const XML_NODE_NAME$h = "w:tc";
 const SD_NODE_NAME$f = "tableCell";
-const validXmlAttributes$a = [];
+const validXmlAttributes$8 = [];
 function encode$n(params, encodedAttrs) {
   const {
     node,
@@ -21359,7 +21364,7 @@ const config$g = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$n,
   decode: decode$p,
-  attributes: validXmlAttributes$a
+  attributes: validXmlAttributes$8
 };
 const translator$G = NodeTranslator.from(config$g);
 const translator$F = NodeTranslator.from({
@@ -21513,7 +21518,7 @@ const isPlaceholderCell = (cell) => {
 };
 const XML_NODE_NAME$g = "w:tr";
 const SD_NODE_NAME$e = "tableRow";
-const validXmlAttributes$9 = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
+const validXmlAttributes$7 = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
   (xmlName) => createAttributeHandler(xmlName)
 );
 const encode$m = (params, encodedAttrs) => {
@@ -21650,7 +21655,7 @@ const config$f = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$m,
   decode: decode$o,
-  attributes: validXmlAttributes$9
+  attributes: validXmlAttributes$7
 };
 const translator$v = NodeTranslator.from(config$f);
 function parseTagValueJSON(json) {
@@ -30429,6 +30434,7 @@ function handleImageNode(node, params, isAnchor) {
   if (!node) return null;
   const { docx, filename, converter } = params;
   const attributes = node?.attributes || {};
+  const { order, originalChildren } = collectPreservedDrawingChildren(node);
   const padding = {
     top: emuToPixels(attributes?.["distT"]),
     bottom: emuToPixels(attributes?.["distB"]),
@@ -30624,6 +30630,7 @@ function handleImageNode(node, params, isAnchor) {
   }
   const wrapValue = wrap2;
   const nodeAttrs = {
+    // originalXml: carbonCopy(node),
     src: finalSrc,
     alt: isMetafileExtension(extension) && !wasConverted ? "Unable to render EMF/WMF image" : docPr?.attributes?.name || "Image",
     extension: finalExtension,
@@ -30658,7 +30665,9 @@ function handleImageNode(node, params, isAnchor) {
       distR: attributes["distR"]
     },
     originalAttributes: node.attributes,
-    rId: relAttributes["Id"]
+    rId: relAttributes["Id"],
+    ...order.length ? { drawingChildOrder: order } : {},
+    ...originalChildren.length ? { originalDrawingChildren: originalChildren } : {}
   };
   return {
     type: "image",
@@ -30683,6 +30692,23 @@ const handleShapeDrawing = (params, node, graphicData, size, padding, marginOffs
   const fallbackType = textBoxContent ? "textbox" : "drawing";
   return buildShapePlaceholder(node, size, padding, marginOffset, fallbackType);
 };
+function collectPreservedDrawingChildren(node) {
+  const order = [];
+  const original = [];
+  if (!Array.isArray(node?.elements)) {
+    return { order, originalChildren: original };
+  }
+  node.elements.forEach((child, index2) => {
+    if (!child) return;
+    const name = child.name ?? null;
+    order.push(name);
+    original.push({
+      index: index2,
+      xml: carbonCopy(child)
+    });
+  });
+  return { order, originalChildren: original };
+}
 const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset, anchorData, wrap2) => {
   const wgp = graphicData.elements.find((el) => el.name === "wpg:wgp");
   if (!wgp) {
@@ -33451,7 +33477,7 @@ function updateNumberingProperties(newNumberingProperties, paragraphNode, pos, e
   }
   tr.setNodeMarkup(pos, null, newAttrs);
 }
-const generateNewListDefinition = ({ numId, listType, level, start, text, fmt, editor }) => {
+const generateNewListDefinition = ({ numId, listType, level, start, text, fmt, editor, markerFontFamily }) => {
   if (typeof listType !== "string") listType = listType.name;
   const definition = listType === "orderedList" ? baseOrderedListDef : baseBulletList;
   const numbering = editor.converter.numbering;
@@ -33505,6 +33531,29 @@ const generateNewListDefinition = ({ numId, listType, level, start, text, fmt, e
         }
       }
     ];
+    if (markerFontFamily) {
+      const rPrIndex = levelProps.elements.findIndex((el) => el.name === "w:rPr");
+      let rPr = levelProps.elements[rPrIndex];
+      if (!rPr) {
+        rPr = {
+          type: "element",
+          name: "w:rPr",
+          elements: []
+        };
+        levelProps.elements.push(rPr);
+      }
+      rPr.elements = rPr.elements.filter((el) => el.name !== "w:rFonts");
+      rPr.elements.push({
+        type: "element",
+        name: "w:rFonts",
+        attributes: {
+          "w:ascii": markerFontFamily,
+          "w:hAnsi": markerFontFamily,
+          "w:eastAsia": markerFontFamily,
+          "w:cs": markerFontFamily
+        }
+      });
+    }
   }
   if (!skipAddingNewAbstract) newNumbering.abstracts[newAbstractId] = newAbstractDef;
   const newNumDef = getBasicNumIdTag(numId, newAbstractId);
@@ -33771,8 +33820,8 @@ const extractListLevelStyles = (cssText, listId, level, numId) => {
   }
   return styleMap;
 };
-const extractParagraphStyles = (cssText, className) => {
-  const pattern = new RegExp(`\\.(${className})\\s*\\{([^}]+)\\}`, "i");
+const extractParagraphStyles = (cssText, selector) => {
+  const pattern = new RegExp(`(${selector})\\s*\\{([^}]+)\\}`, "i");
   const match = cssText.match(pattern);
   if (!match) return null;
   const rawStyles = match[2].split(";").map((line) => line.trim()).filter(Boolean);
@@ -33887,7 +33936,7 @@ const handleDocxPaste = (html, editor, view) => {
   cleanedHtml = cleanHtmlUnnecessaryTags(cleanedHtml);
   const tempDiv = document.createElement("div");
   tempDiv.innerHTML = cleanedHtml;
-  const data = tempDiv.querySelectorAll("p, li");
+  const data = tempDiv.querySelectorAll("p, li, " + [1, 2, 3, 4, 5, 6, 7, 8, 9].map((n) => `h${n}`).join(", "));
   const startMap = {};
   data.forEach((item) => {
     let type2;
@@ -33899,13 +33948,24 @@ const handleDocxPaste = (html, editor, view) => {
     const styleAttr = item.getAttribute("style") || "";
     const msoListMatch = styleAttr.match(/mso-list:\s*l(\d+)\s+level(\d+)\s+lfo(\d+)/);
     const css = tempDiv.querySelector("style").innerHTML;
-    const normalStyles = extractParagraphStyles(css, "MsoNormal");
-    const paragraphStyles = extractParagraphStyles(css, item.getAttribute("class"));
-    let styleChain = { ...normalStyles, ...paragraphStyles };
+    const normalStyles = extractParagraphStyles(css, ".MsoNormal");
+    let styleId = item.getAttribute("class");
+    let charStyles = {};
+    if (item.localName.startsWith("h") && !styleId) {
+      styleId = item.localName;
+      const level = styleId.substring(1);
+      charStyles = extractParagraphStyles(css, `.Heading${level}Char`);
+    } else if (styleId) {
+      styleId = `.${styleId}`;
+    }
+    const paragraphStyles = extractParagraphStyles(css, styleId);
+    let styleChain = { ...normalStyles, ...paragraphStyles, ...charStyles };
     const numberingDefinedInline = !paragraphStyles || !paragraphStyles["mso-list"];
     if (msoListMatch) {
       const [, abstractId, level, numId] = msoListMatch;
       const numberingStyles = extractListLevelStyles(css, abstractId, level, numId) || {};
+      const markerFontFamily = numberingStyles?.["font-family"] ?? normalStyles?.["font-family"];
+      delete numberingStyles["font-family"];
       if (numberingDefinedInline) {
         styleChain = { ...normalStyles, ...paragraphStyles, ...numberingStyles };
       } else {
@@ -33928,6 +33988,7 @@ const handleDocxPaste = (html, editor, view) => {
         if (!startMap[numId]) startMap[numId] = startGetter(item.children[0]?.innerText || "1");
         start = startMap[numId];
       }
+      item.setAttribute("data-marker-font-family", markerFontFamily);
       item.setAttribute("data-num-id", numId);
       item.setAttribute("data-list-level", parseInt(level) - 1);
       item.setAttribute("data-start", start);
@@ -33976,6 +34037,24 @@ const handleDocxPaste = (html, editor, view) => {
         }
       });
       item.setAttribute("data-text-styles", JSON.stringify(textStyles));
+      for (const child of item.children) {
+        if (child.style) {
+          Object.keys(textStyles).forEach((key) => {
+            const styleValue = textStyles[key];
+            if (styleValue) {
+              child.style[key] = styleValue;
+            }
+          });
+        }
+      }
+    }
+    if (resolvedStyle["font-weight"] === "bold") {
+      item.style.fontWeight = "bold";
+      for (const child of item.children) {
+        if (child.style) {
+          child.style.fontWeight = "bold";
+        }
+      }
     }
     extractAndRemoveConditionalPrefix(item);
   });
@@ -34019,6 +34098,7 @@ const transformWordLists = (container, editor) => {
     const numFmt = item.getAttribute("data-num-fmt");
     const start = item.getAttribute("data-start");
     const lvlText = item.getAttribute("data-lvl-text");
+    const markerFontFamily = item.getAttribute("data-marker-font-family");
     const importedId = item.getAttribute("data-num-id");
     if (!mappedLists[importedId]) mappedLists[importedId] = ListHelpers.getNewListId(editor);
     const id = mappedLists[importedId];
@@ -34030,7 +34110,8 @@ const transformWordLists = (container, editor) => {
       start,
       fmt: numFmt,
       text: lvlText,
-      editor
+      editor,
+      markerFontFamily
     });
     if (!lists[id]) lists[id] = { levels: {} };
     const currentListByNumId = lists[id];
@@ -34063,6 +34144,11 @@ const transformWordLists = (container, editor) => {
         const styleValue = textStyles[key];
         if (styleValue) {
           pElement.style[key] = styleValue;
+          for (const child of pElement.children) {
+            if (child.style) {
+              child.style[key] = styleValue;
+            }
+          }
         }
       });
     }
@@ -36396,11 +36482,71 @@ function translateShapeGroup(params) {
     elements: []
   });
 }
+function mergeDrawingChildren({ order, generated, original }) {
+  const genQueues = groupByName(generated);
+  const originalsByIndex = groupByIndex(original);
+  return mergeWithOrder(order, genQueues, originalsByIndex);
+}
+function groupByIndex(entries = []) {
+  const map = /* @__PURE__ */ new Map();
+  entries.forEach((entry) => {
+    if (!entry) return;
+    const { index: index2, xml } = entry;
+    if (typeof index2 === "number" && xml && xml.name !== "wp:extent") {
+      map.set(index2, carbonCopy(xml));
+    }
+  });
+  return map;
+}
+function mergeWithOrder(order = [], genQueues, originalsByIndex) {
+  const out = [];
+  const namesInOrder = new Set(order);
+  order.forEach((name, idx) => {
+    if (name === "wp:extent") {
+      const queue3 = genQueues.get("wp:extent") || [];
+      if (queue3.length) {
+        out.push(queue3.shift());
+        if (!queue3.length) genQueues.delete("wp:extent");
+      }
+      return;
+    }
+    if (originalsByIndex.has(idx)) {
+      out.push(originalsByIndex.get(idx));
+      originalsByIndex.delete(idx);
+      if (genQueues.has(name)) {
+        genQueues.delete(name);
+      }
+      return;
+    }
+    const queue2 = genQueues.get(name) || [];
+    if (queue2.length) {
+      out.push(queue2.shift());
+      if (!queue2.length) genQueues.delete(name);
+    }
+  });
+  originalsByIndex.forEach((xml) => out.push(xml));
+  genQueues.forEach((queue2, name) => {
+    if (namesInOrder.has(name)) return;
+    queue2.forEach((el) => out.push(el));
+  });
+  return out;
+}
+function groupByName(nodes = []) {
+  const map = /* @__PURE__ */ new Map();
+  nodes.forEach((el) => {
+    if (!el?.name) return;
+    const list = map.get(el.name) || [];
+    list.push(carbonCopy(el));
+    map.set(el.name, list);
+  });
+  return map;
+}
 function translateAnchorNode(params) {
   const { attrs } = params.node;
   const anchorElements = [];
-  const hasSimplePos = attrs.simplePos || attrs.originalAttributes?.simplePos;
-  if (hasSimplePos) {
+  const useOriginalChildren = Array.isArray(attrs.originalDrawingChildren) && attrs.originalDrawingChildren.length > 0;
+  const hasSimplePos = attrs.simplePos !== void 0 || attrs.originalAttributes?.simplePos !== void 0;
+  if (!useOriginalChildren && hasSimplePos) {
     anchorElements.push({
       name: "wp:simplePos",
       attributes: {
@@ -36409,7 +36555,7 @@ function translateAnchorNode(params) {
       }
     });
   }
-  if (attrs.anchorData) {
+  if (!useOriginalChildren && attrs.anchorData) {
     const hElements = [];
     if (attrs.marginOffset.horizontal !== void 0) {
       hElements.push({
@@ -36455,25 +36601,14 @@ function translateAnchorNode(params) {
   if (inlineAttrs.relativeHeight == null) {
     inlineAttrs.relativeHeight = 1;
   }
-  if (attrs.originalAttributes?.simplePos !== void 0) {
-    inlineAttrs.simplePos = attrs.originalAttributes.simplePos;
-  } else if (hasSimplePos) {
+  if (attrs.originalAttributes?.simplePos === void 0 && hasSimplePos) {
     inlineAttrs.simplePos = "1";
   }
-  if (attrs.originalAttributes?.locked !== void 0) {
-    inlineAttrs.locked = attrs.originalAttributes.locked;
-  }
-  if (attrs.originalAttributes?.layoutInCell !== void 0) {
-    inlineAttrs.layoutInCell = attrs.originalAttributes.layoutInCell;
-  }
-  if (attrs.originalAttributes?.allowOverlap !== void 0) {
-    inlineAttrs.allowOverlap = attrs.originalAttributes.allowOverlap;
-  }
   const wrapElement = {
     name: `wp:wrap${attrs.wrap?.type || "None"}`
     // Important: wp:anchor will break if no wrapping is specified. We need to use wrapNone.
   };
-  switch (attrs.wrap?.type) {
+  switch (useOriginalChildren ? void 0 : attrs.wrap?.type) {
     case "Square":
       wrapElement.attributes = {
         wrapText: attrs.wrap.attrs.wrapText
@@ -36553,15 +36688,33 @@ function translateAnchorNode(params) {
     wrapElement,
     ...nodeElements.elements.slice(effectIndex + 1)
   ];
+  const mergedElements = mergeDrawingChildren({
+    order: attrs.drawingChildOrder || [],
+    original: attrs.originalDrawingChildren || [],
+    generated: [...anchorElements, ...elementsWithWrap]
+  });
   return {
     name: "wp:anchor",
     attributes: inlineAttrs,
-    elements: [...anchorElements, ...elementsWithWrap]
+    elements: mergedElements
   };
 }
 const XML_NODE_NAME$f = "wp:anchor";
 const SD_NODE_NAME$d = ["image", "shapeGroup", "vectorShape", "contentBlock"];
-const validXmlAttributes$8 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
+const validXmlAttributes$6 = [
+  "distT",
+  "distB",
+  "distL",
+  "distR",
+  "allowOverlap",
+  "behindDoc",
+  "layoutInCell",
+  "locked",
+  "relativeHeight",
+  "simplePos",
+  "wp14:anchorId",
+  "wp14:editId"
+].map((xmlName) => createAttributeHandler(xmlName));
 function encode$l(params) {
   const { node } = params.extraParams;
   if (!node || !node.name) {
@@ -36582,7 +36735,7 @@ const config$e = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$l,
   decode: decode$n,
-  attributes: validXmlAttributes$8
+  attributes: validXmlAttributes$6
 };
 const translator$u = NodeTranslator.from(config$e);
 function handleInlineNode(params) {
@@ -36593,16 +36746,29 @@ function handleInlineNode(params) {
   return handleImageNode(node, params, false);
 }
 function translateInlineNode(params) {
+  const { attrs } = params.node;
   const nodeElements = translateImageNode(params);
+  const inlineAttrs = {
+    ...attrs.originalAttributes || {},
+    ...nodeElements.attributes || {}
+  };
+  const generatedElements = nodeElements?.elements || [];
+  const mergedElements = mergeDrawingChildren({
+    order: params.node?.attrs?.drawingChildOrder || [],
+    original: params.node?.attrs?.originalDrawingChildren || [],
+    generated: generatedElements
+  });
   return {
     name: "wp:inline",
-    attributes: nodeElements.attributes,
-    elements: nodeElements.elements
+    attributes: inlineAttrs,
+    elements: mergedElements
   };
 }
 const XML_NODE_NAME$e = "wp:inline";
 const SD_NODE_NAME$c = ["image", "shapeGroup", "vectorShape", "contentBlock"];
-const validXmlAttributes$7 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
+const validXmlAttributes$5 = ["distT", "distB", "distL", "distR", "wp14:anchorId", "wp14:editId"].map(
+  (xmlName) => createAttributeHandler(xmlName)
+);
 function encode$k(params) {
   const { node } = params.extraParams;
   if (!node || !node.name) {
@@ -36623,12 +36789,12 @@ const config$d = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$k,
   decode: decode$m,
-  attributes: validXmlAttributes$7
+  attributes: validXmlAttributes$5
 };
 const translator$t = NodeTranslator.from(config$d);
 const XML_NODE_NAME$d = "w:drawing";
 const SD_NODE_NAME$b = [];
-const validXmlAttributes$6 = [];
+const validXmlAttributes$4 = [];
 function encode$j(params) {
   const nodes = params.nodes;
   const node = nodes[0];
@@ -36636,14 +36802,21 @@ function encode$j(params) {
     "wp:anchor": translator$u,
     "wp:inline": translator$t
   };
-  const result = node.elements.reduce((acc, child) => {
+  const result = (node.elements || []).reduce((acc, child) => {
     if (acc) return acc;
     const translator2 = translatorByChildName[child.name];
     if (!translator2) return acc;
     const childResult = translator2.encode({ ...params, extraParams: { node: child } });
     return childResult || acc;
   }, null);
-  return result;
+  if (result) return result;
+  return {
+    type: "passthroughBlock",
+    attrs: {
+      originalName: "w:drawing",
+      originalXml: carbonCopy(node)
+    }
+  };
 }
 function decode$l(params) {
   const { node } = params;
@@ -36666,7 +36839,7 @@ const config$c = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$j,
   decode: decode$l,
-  attributes: validXmlAttributes$6
+  attributes: validXmlAttributes$4
 };
 const translator$s = NodeTranslator.from(config$c);
 function getTextNodeForExport(text, marks, params) {
@@ -37497,7 +37670,7 @@ function generateSdtPrTagForStructuredContent({ node }) {
 }
 const XML_NODE_NAME$c = "w:sdt";
 const SD_NODE_NAME$a = ["fieldAnnotation", "structuredContent", "structuredContentBlock", "documentSection"];
-const validXmlAttributes$5 = [];
+const validXmlAttributes$3 = [];
 function encode$i(params) {
   const nodes = params.nodes;
   const node = nodes[0];
@@ -37532,7 +37705,7 @@ const config$b = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$i,
   decode: decode$k,
-  attributes: validXmlAttributes$5
+  attributes: validXmlAttributes$3
 };
 const translator$r = NodeTranslator.from(config$b);
 function preProcessVerticalMergeCells(table, { editorSchema }) {
@@ -38167,7 +38340,7 @@ const attrConfig$3 = Object.freeze({
   encode: encode$b,
   decode: decode$d
 });
-const validXmlAttributes$4 = [attrConfig$7, attrConfig$6, attrConfig$5, attrConfig$4, attrConfig$3];
+const bookmarkStartAttrConfigs = [attrConfig$7, attrConfig$6, attrConfig$5, attrConfig$4, attrConfig$3];
 const XML_NODE_NAME$9 = "w:bookmarkStart";
 const SD_NODE_NAME$8 = "bookmarkStart";
 const encode$a = (params, encodedAttrs = {}) => {
@@ -38192,7 +38365,7 @@ const config$8 = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$a,
   decode: decode$c,
-  attributes: validXmlAttributes$4
+  attributes: bookmarkStartAttrConfigs
 };
 const translator$8 = NodeTranslator.from(config$8);
 const encode$9 = (attributes) => {
@@ -38219,7 +38392,7 @@ const attrConfig$1 = Object.freeze({
   encode: encode$8,
   decode: decode$a
 });
-const validXmlAttributes$3 = [attrConfig$2, attrConfig$1];
+const bookmarkEndAttrConfigs = [attrConfig$2, attrConfig$1];
 const XML_NODE_NAME$8 = "w:bookmarkEnd";
 const SD_NODE_NAME$7 = "bookmarkEnd";
 const encode$7 = (params, encodedAttrs = {}) => {
@@ -38244,7 +38417,7 @@ const config$7 = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$7,
   decode: decode$9,
-  attributes: validXmlAttributes$3
+  attributes: bookmarkEndAttrConfigs
 };
 const translator$7 = NodeTranslator.from(config$7);
 const decode$8 = (attrs) => attrs?.["w:id"];
@@ -39210,7 +39383,8 @@ const INLINE_NODE_NAMES = /* @__PURE__ */ new Set([
 ]);
 const BLOCK_BOUNDARY_NAMES = /* @__PURE__ */ new Set(["w:body", "w:tbl", "w:tc", "w:tr"]);
 const isInlineContext = (path = [], currentNodeName) => {
-  if (currentNodeName && INLINE_NODE_NAMES.has(currentNodeName)) {
+  const immediateName = currentNodeName ?? path[path.length - 1]?.name;
+  if (immediateName && INLINE_NODE_NAMES.has(immediateName)) {
     return true;
   }
   if (!Array.isArray(path) || path.length === 0) return false;
@@ -40348,27 +40522,28 @@ const preProcessNodesForFldChar = (nodes = [], docx) => {
     const fldCharEl = node.elements?.find((el) => el.name === "w:fldChar");
     const fldType = fldCharEl?.attributes?.["w:fldCharType"];
     const instrTextEl = node.elements?.find((el) => el.name === "w:instrText");
+    const rawNode = carbonCopy(node);
     collecting = collectedNodesStack.length > 0;
     if (fldType === "begin") {
       collectedNodesStack.push([]);
-      rawCollectedNodesStack.push([node]);
+      rawCollectedNodesStack.push([rawNode]);
       currentFieldStack.push({ instrText: "" });
       continue;
     }
     if (instrTextEl && collecting && currentFieldStack.length > 0) {
-      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       currentFieldStack[currentFieldStack.length - 1].instrText += (instrTextEl.elements?.[0]?.text || "") + " ";
       continue;
     }
     if (fldType === "end") {
       if (collecting) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       }
       finalizeField();
       continue;
     } else if (fldType === "separate") {
       if (collecting) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       }
       continue;
     }
@@ -40379,21 +40554,21 @@ const preProcessNodesForFldChar = (nodes = [], docx) => {
         childResult.unpairedBegin.forEach((pendingField) => {
           currentFieldStack.push(pendingField.fieldInfo);
           collectedNodesStack.push([node]);
-          rawCollectedNodesStack.push([node]);
+          rawCollectedNodesStack.push([rawNode]);
         });
       } else if (childResult.unpairedEnd) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
         finalizeField();
       } else if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       } else {
         processedNodes.push(node);
       }
     } else if (collecting) {
       collectedNodesStack[collectedNodesStack.length - 1].push(node);
-      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
     } else {
       processedNodes.push(node);
     }
@@ -40998,8 +41173,48 @@ function filterOutRootInlineNodes(content = []) {
     "commentReference",
     "structuredContent"
   ]);
-  return content.filter((node) => node && typeof node.type === "string" && !INLINE_TYPES.has(node.type));
+  const PRESERVABLE_INLINE_XML_NAMES = {
+    bookmarkStart: "w:bookmarkStart",
+    bookmarkEnd: "w:bookmarkEnd"
+  };
+  const result = [];
+  content.forEach((node) => {
+    if (!node || typeof node.type !== "string") return;
+    const type2 = node.type;
+    const preservableNodeName = PRESERVABLE_INLINE_XML_NAMES[type2];
+    if (!INLINE_TYPES.has(type2)) {
+      result.push(node);
+    } else if (preservableNodeName) {
+      const originalXml = buildOriginalXml(type2, node.attrs, PRESERVABLE_INLINE_XML_NAMES);
+      result.push({
+        type: "passthroughBlock",
+        attrs: {
+          originalName: preservableNodeName,
+          ...originalXml ? { originalXml } : {}
+        }
+      });
+    }
+  });
+  return result;
 }
+const buildOriginalXml = (type2, attrs, preservableTags) => {
+  const attrConfigsByType = {
+    bookmarkStart: bookmarkStartAttrConfigs,
+    bookmarkEnd: bookmarkEndAttrConfigs
+  };
+  const configs = attrConfigsByType[type2];
+  if (!configs) return null;
+  const xmlAttrs = {};
+  configs.forEach((cfg) => {
+    const val = cfg.decode(attrs || {});
+    if (val !== void 0) {
+      xmlAttrs[cfg.xmlName] = val;
+    }
+  });
+  const attributes = Object.keys(xmlAttrs).length ? xmlAttrs : void 0;
+  const name = preservableTags[type2];
+  return { name, ...attributes ? { attributes } : {}, elements: [] };
+};
 function collapseWhitespaceNextToInlinePassthrough(content = []) {
   if (!Array.isArray(content) || content.length === 0) return;
   const sequence = collectInlineSequence(content);
@@ -42131,7 +42346,7 @@ const _SuperConverter = class _SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.0.0-beta.40") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.0.0-beta.54") {
     return _SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**