superdoc 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/super-editor/chunks/{converter-D9KiDgXx.js → converter-CfmIU--8.js}

@@ -21649,7 +21649,7 @@ function handleAnnotationNode(params) {
     attrs.displayLabel = placeholderLabel;
   }
   const { attrs: marksAsAttrs, marks } = parseAnnotationMarks(sdtContent);
-  const allAttrs = { ...attrs, ...marksAsAttrs };
+  const allAttrs = { ...attrs, ...marksAsAttrs, ...sdtPr && { sdtPr } };
   if (!allAttrs.hash) allAttrs.hash = generateDocxRandomId(4);
   if (!attrs.fieldId || !attrs.type) {
     return null;
@@ -21809,16 +21809,13 @@ function handleDocPartObj(params) {
   const sdtPr = node.elements.find((el) => el.name === "w:sdtPr");
   const docPartObj = sdtPr?.elements.find((el) => el.name === "w:docPartObj");
   const docPartGallery = docPartObj?.elements.find((el) => el.name === "w:docPartGallery");
-  const docPartGalleryType = docPartGallery?.attributes["w:val"];
-  if (!docPartGalleryType || !validGalleryTypeMap[docPartGalleryType]) {
-    return null;
-  }
+  const docPartGalleryType = docPartGallery?.attributes?.["w:val"] ?? null;
   const content = node?.elements.find((el) => el.name === "w:sdtContent");
-  const handler2 = validGalleryTypeMap[docPartGalleryType];
+  const handler2 = validGalleryTypeMap[docPartGalleryType] || genericDocPartHandler;
   const result = handler2({
     ...params,
     nodes: [content],
-    extraParams: { ...params.extraParams || {}, sdtPr }
+    extraParams: { ...params.extraParams || {}, sdtPr, docPartGalleryType }
   });
   return result;
 }
@@ -21831,13 +21828,43 @@ const tableOfContentsHandler = (params) => {
   });
   const sdtPr = params.extraParams.sdtPr;
   const id = sdtPr.elements?.find((el) => el.name === "w:id")?.attributes["w:val"] || "";
+  const docPartObj = sdtPr?.elements.find((el) => el.name === "w:docPartObj");
+  const docPartUnique = docPartObj?.elements.some((el) => el.name === "w:docPartUnique") ?? false;
   const result = {
     type: "documentPartObject",
     content: translatedContent,
     attrs: {
       id,
       docPartGallery: "Table of Contents",
-      docPartUnique: true
+      docPartUnique,
+      sdtPr
+      // Passthrough for round-trip preservation
+    }
+  };
+  return result;
+};
+const genericDocPartHandler = (params) => {
+  const node = params.nodes[0];
+  const translatedContent = params.nodeListHandler.handler({
+    ...params,
+    nodes: node.elements,
+    path: [...params.path || [], node]
+  });
+  const sdtPr = params.extraParams.sdtPr;
+  const docPartGalleryType = params.extraParams.docPartGalleryType;
+  const id = sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes["w:val"] || "";
+  const docPartObj = sdtPr?.elements.find((el) => el.name === "w:docPartObj");
+  const docPartGallery = docPartGalleryType ?? docPartObj?.elements?.find((el) => el.name === "w:docPartGallery")?.attributes?.["w:val"] ?? null;
+  const docPartUnique = docPartObj?.elements.some((el) => el.name === "w:docPartUnique") ?? false;
+  const result = {
+    type: "documentPartObject",
+    content: translatedContent,
+    attrs: {
+      id,
+      docPartGallery,
+      docPartUnique,
+      sdtPr
+      // Passthrough for round-trip preservation of all sdtPr elements
     }
   };
   return result;
@@ -21859,6 +21886,9 @@ function handleDocumentSectionNode(params) {
   const titleTag = sdtPr?.elements.find((el) => el.name === "w:alias");
   const title = titleTag?.attributes?.["w:val"] || tagValue.title || null;
   const { description } = tagValue;
+  const lockTag = sdtPr?.elements.find((el) => el.name === "w:lock");
+  const lockValue = lockTag?.attributes?.["w:val"];
+  const isLocked = lockValue === "sdtContentLocked";
   const sdtContent = node.elements.find((el) => el.name === "w:sdtContent");
   const translatedContent = nodeListHandler.handler({
     ...params,
@@ -21871,7 +21901,10 @@ function handleDocumentSectionNode(params) {
     attrs: {
       id,
       title,
-      description
+      description,
+      isLocked,
+      ...sdtPr && { sdtPr }
+      // Passthrough for round-trip preservation of unknown elements only if it exists
     }
   };
   return result;
@@ -24664,7 +24697,10 @@ function getThemeColor(name) {
     text1: "#000000",
     text2: "#1f497d",
     background1: "#ffffff",
-    background2: "#eeece1"
+    background2: "#eeece1",
+    // Office XML shortcuts
+    bg1: "#ffffff",
+    bg2: "#eeece1"
   };
   return colors[name] ?? "#000000";
 }
@@ -24701,7 +24737,10 @@ function applyColorModifier(hexColor, modifier, value) {
 function extractStrokeWidth(spPr) {
   const ln = spPr?.elements?.find((el) => el.name === "a:ln");
   const w2 = ln?.attributes?.["w"];
-  return w2 ? emuToPixels(w2) : 1;
+  if (!w2) return 1;
+  const emu = typeof w2 === "string" ? parseFloat(w2) : w2;
+  const STROKE_DPI = 72;
+  return emu * STROKE_DPI / 914400;
 }
 function extractStrokeColor(spPr, style) {
   const ln = spPr?.elements?.find((el) => el.name === "a:ln");
@@ -24762,6 +24801,7 @@ function extractFillColor(spPr, style) {
     if (schemeClr2) {
       const themeName2 = schemeClr2.attributes?.["val"];
       let color2 = getThemeColor(themeName2);
+      let alpha = null;
       const modifiers2 = schemeClr2.elements || [];
       modifiers2.forEach((mod) => {
         if (mod.name === "a:shade") {
@@ -24772,18 +24812,32 @@ function extractFillColor(spPr, style) {
           color2 = applyColorModifier(color2, "lumMod", mod.attributes["val"]);
         } else if (mod.name === "a:lumOff") {
           color2 = applyColorModifier(color2, "lumOff", mod.attributes["val"]);
+        } else if (mod.name === "a:alpha") {
+          alpha = parseInt(mod.attributes["val"]) / 1e5;
         }
       });
+      if (alpha !== null && alpha < 1) {
+        return { type: "solidWithAlpha", color: color2, alpha };
+      }
       return color2;
     }
     const srgbClr = solidFill.elements?.find((el) => el.name === "a:srgbClr");
     if (srgbClr) {
-      return "#" + srgbClr.attributes?.["val"];
+      let alpha = null;
+      const alphaEl = srgbClr.elements?.find((el) => el.name === "a:alpha");
+      if (alphaEl) {
+        alpha = parseInt(alphaEl.attributes?.["val"] || "100000", 10) / 1e5;
+      }
+      const color2 = "#" + srgbClr.attributes?.["val"];
+      if (alpha !== null && alpha < 1) {
+        return { type: "solidWithAlpha", color: color2, alpha };
+      }
+      return color2;
     }
   }
   const gradFill = spPr?.elements?.find((el) => el.name === "a:gradFill");
   if (gradFill) {
-    return "#cccccc";
+    return extractGradientFill(gradFill);
   }
   const blipFill = spPr?.elements?.find((el) => el.name === "a:blipFill");
   if (blipFill) {
@@ -24792,6 +24846,8 @@ function extractFillColor(spPr, style) {
   if (!style) return "#5b9bd5";
   const fillRef = style.elements?.find((el) => el.name === "a:fillRef");
   if (!fillRef) return "#5b9bd5";
+  const fillRefIdx = fillRef.attributes?.["idx"];
+  if (fillRefIdx === "0") return null;
   const schemeClr = fillRef.elements?.find((el) => el.name === "a:schemeClr");
   if (!schemeClr) return "#5b9bd5";
   const themeName = schemeClr.attributes?.["val"];
@@ -24808,9 +24864,49 @@ function extractFillColor(spPr, style) {
   });
   return color;
 }
+function extractGradientFill(gradFill) {
+  const gradient = {
+    type: "gradient",
+    stops: [],
+    angle: 0
+  };
+  const gsLst = gradFill.elements?.find((el) => el.name === "a:gsLst");
+  if (gsLst) {
+    const stops = gsLst.elements?.filter((el) => el.name === "a:gs") || [];
+    gradient.stops = stops.map((stop) => {
+      const pos = parseInt(stop.attributes?.["pos"] || "0", 10) / 1e5;
+      const srgbClr = stop.elements?.find((el) => el.name === "a:srgbClr");
+      let color = "#000000";
+      let alpha = 1;
+      if (srgbClr) {
+        color = "#" + srgbClr.attributes?.["val"];
+        const alphaEl = srgbClr.elements?.find((el) => el.name === "a:alpha");
+        if (alphaEl) {
+          alpha = parseInt(alphaEl.attributes?.["val"] || "100000", 10) / 1e5;
+        }
+      }
+      return { position: pos, color, alpha };
+    });
+  }
+  const lin = gradFill.elements?.find((el) => el.name === "a:lin");
+  if (lin) {
+    const ang = parseInt(lin.attributes?.["ang"] || "0", 10) / 6e4;
+    gradient.angle = ang;
+  }
+  const path = gradFill.elements?.find((el) => el.name === "a:path");
+  if (path) {
+    gradient.gradientType = "radial";
+    gradient.path = path.attributes?.["path"] || "circle";
+  } else {
+    gradient.gradientType = "linear";
+  }
+  return gradient;
+}
 const DRAWING_XML_TAG = "w:drawing";
 const SHAPE_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
 const GROUP_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";
+const DEFAULT_SHAPE_WIDTH = 100;
+const DEFAULT_SHAPE_HEIGHT = 100;
 function handleImageNode(node, params, isAnchor) {
   const { docx, filename } = params;
   const { attributes } = node;
@@ -24934,7 +25030,7 @@ function handleImageNode(node, params, isAnchor) {
       horizontal: positionHValue,
       top: positionVValue
     };
-    return handleShapeDrawing(params, node, graphicData, size, padding, shapeMarginOffset);
+    return handleShapeDrawing(params, node, graphicData, size, padding, shapeMarginOffset, anchorData, wrap2, isAnchor);
   }
   if (uri2 === GROUP_URI) {
     const shapeMarginOffset = {
@@ -24942,13 +25038,16 @@ function handleImageNode(node, params, isAnchor) {
       horizontal: positionHValue,
       top: positionVValue
     };
-    return handleShapeGroup(params, node, graphicData, size, padding, shapeMarginOffset);
+    return handleShapeGroup(params, node, graphicData, size, padding, shapeMarginOffset, anchorData, wrap2);
   }
   const picture = graphicData?.elements.find((el) => el.name === "pic:pic");
   if (!picture || !picture.elements) return null;
   const blipFill = picture.elements.find((el) => el.name === "pic:blipFill");
   const blip = blipFill?.elements.find((el) => el.name === "a:blip");
   if (!blip) return null;
+  const stretch = blipFill?.elements.find((el) => el.name === "a:stretch");
+  const fillRect = stretch?.elements.find((el) => el.name === "a:fillRect");
+  const shouldStretch = Boolean(stretch && fillRect);
   const spPr = picture.elements.find((el) => el.name === "pic:spPr");
   if (spPr) {
     const xfrm = spPr.elements.find((el) => el.name === "a:xfrm");
@@ -25002,6 +25101,7 @@ function handleImageNode(node, params, isAnchor) {
         wrapText: wrap2.attrs.wrapText
       } : {},
       wrapTopAndBottom: wrap2.type === "TopAndBottom",
+      shouldStretch,
       originalPadding: {
         distT: attributes["distT"],
         distB: attributes["distB"],
@@ -25013,26 +25113,25 @@ function handleImageNode(node, params, isAnchor) {
     }
   };
 }
-const handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset) => {
+const handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset, anchorData, wrap2, isAnchor) => {
   const wsp = graphicData.elements.find((el) => el.name === "wps:wsp");
   const textBox = wsp.elements.find((el) => el.name === "wps:txbx");
   const textBoxContent = textBox?.elements?.find((el) => el.name === "w:txbxContent");
   const spPr = wsp.elements.find((el) => el.name === "wps:spPr");
   const prstGeom = spPr?.elements.find((el) => el.name === "a:prstGeom");
   const shapeType = prstGeom?.attributes["prst"];
-  if (shapeType === "rect" && !textBoxContent) {
-    return getRectangleShape(params, spPr);
+  const hasGradientFill = spPr?.elements?.find((el) => el.name === "a:gradFill");
+  if (shapeType === "rect" && !textBoxContent && !hasGradientFill) {
+    return getRectangleShape(params, spPr, node, marginOffset, anchorData, wrap2, isAnchor);
   }
-  if (shapeType && !textBoxContent) {
-    const result = getVectorShape({ params, graphicData });
+  if (shapeType) {
+    const result = getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap2, isAnchor });
     if (result) return result;
   }
-  if (!textBoxContent) {
-    return buildShapePlaceholder(node, size, padding, marginOffset, "drawing");
-  }
-  return buildShapePlaceholder(node, size, padding, marginOffset, "textbox");
+  const fallbackType = textBoxContent ? "textbox" : "drawing";
+  return buildShapePlaceholder(node, size, padding, marginOffset, fallbackType);
 };
-const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset) => {
+const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset, anchorData, wrap2) => {
   const wgp = graphicData.elements.find((el) => el.name === "wpg:wgp");
   if (!wgp) {
     return buildShapePlaceholder(node, size, padding, marginOffset, "group");
@@ -25065,6 +25164,7 @@ const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset
     }
   }
   const childShapes = wgp.elements.filter((el) => el.name === "wps:wsp");
+  const childPictures = wgp.elements.filter((el) => el.name === "pic:pic");
   const shapes = childShapes.map((wsp) => {
     const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
     if (!spPr) return null;
@@ -25103,6 +25203,14 @@ const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset
     const cNvPr = wsp.elements?.find((el) => el.name === "wps:cNvPr");
     const shapeId = cNvPr?.attributes?.["id"];
     const shapeName = cNvPr?.attributes?.["name"];
+    const textBox = wsp.elements?.find((el) => el.name === "wps:txbx");
+    const textBoxContent = textBox?.elements?.find((el) => el.name === "w:txbxContent");
+    const bodyPr = wsp.elements?.find((el) => el.name === "wps:bodyPr");
+    let textContent = null;
+    if (textBoxContent) {
+      textContent = extractTextFromTextBox(textBoxContent, bodyPr);
+    }
+    const textAlign = textContent?.horizontalAlign || "left";
     return {
       shapeType: "vectorShape",
       attrs: {
@@ -25118,10 +25226,75 @@ const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset
         strokeColor,
         strokeWidth,
         shapeId,
-        shapeName
+        shapeName,
+        textContent,
+        textAlign,
+        textVerticalAlign: textContent?.verticalAlign,
+        textInsets: textContent?.insets
+      }
+    };
+  }).filter(Boolean);
+  const pictures = childPictures.map((pic) => {
+    const spPr = pic.elements?.find((el) => el.name === "pic:spPr");
+    if (!spPr) return null;
+    const xfrm2 = spPr.elements?.find((el) => el.name === "a:xfrm");
+    const off = xfrm2?.elements?.find((el) => el.name === "a:off");
+    const ext = xfrm2?.elements?.find((el) => el.name === "a:ext");
+    const rawX = off?.attributes?.["x"] ? parseFloat(off.attributes["x"]) : 0;
+    const rawY = off?.attributes?.["y"] ? parseFloat(off.attributes["y"]) : 0;
+    const rawWidth = ext?.attributes?.["cx"] ? parseFloat(ext.attributes["cx"]) : 914400;
+    const rawHeight = ext?.attributes?.["cy"] ? parseFloat(ext.attributes["cy"]) : 914400;
+    let x2, y2, width, height;
+    if (groupTransform.childWidth && groupTransform.childHeight) {
+      const scaleX = groupTransform.width / groupTransform.childWidth;
+      const scaleY = groupTransform.height / groupTransform.childHeight;
+      const childOriginX = groupTransform.childOriginXEmu || 0;
+      const childOriginY = groupTransform.childOriginYEmu || 0;
+      x2 = groupTransform.x + emuToPixels((rawX - childOriginX) * scaleX);
+      y2 = groupTransform.y + emuToPixels((rawY - childOriginY) * scaleY);
+      width = emuToPixels(rawWidth * scaleX);
+      height = emuToPixels(rawHeight * scaleY);
+    } else {
+      x2 = emuToPixels(rawX);
+      y2 = emuToPixels(rawY);
+      width = emuToPixels(rawWidth);
+      height = emuToPixels(rawHeight);
+    }
+    const blipFill = pic.elements?.find((el) => el.name === "pic:blipFill");
+    const blip = blipFill?.elements?.find((el) => el.name === "a:blip");
+    if (!blip) return null;
+    const rEmbed = blip.attributes?.["r:embed"];
+    if (!rEmbed) return null;
+    const currentFile = params.filename || "document.xml";
+    let rels = params.docx[`word/_rels/${currentFile}.rels`];
+    if (!rels) rels = params.docx[`word/_rels/document.xml.rels`];
+    const relationships = rels?.elements.find((el) => el.name === "Relationships");
+    const { elements } = relationships || [];
+    const rel = elements?.find((el) => el.attributes["Id"] === rEmbed);
+    if (!rel) return null;
+    const targetPath = rel.attributes?.["Target"];
+    let path = `word/${targetPath}`;
+    if (targetPath.startsWith("/word") || targetPath.startsWith("/media")) {
+      path = targetPath.substring(1);
+    }
+    const nvPicPr = pic.elements?.find((el) => el.name === "pic:nvPicPr");
+    const cNvPr = nvPicPr?.elements?.find((el) => el.name === "pic:cNvPr");
+    const picId = cNvPr?.attributes?.["id"];
+    const picName = cNvPr?.attributes?.["name"];
+    return {
+      shapeType: "image",
+      attrs: {
+        x: x2,
+        y: y2,
+        width,
+        height,
+        src: path,
+        imageId: picId,
+        imageName: picName
       }
     };
   }).filter(Boolean);
+  const allShapes = [...pictures, ...shapes];
   const schemaAttrs = {};
   const drawingNode = params.nodes?.[0];
   if (drawingNode?.name === DRAWING_XML_TAG) {
@@ -25132,38 +25305,137 @@ const handleShapeGroup = (params, node, graphicData, size, padding, marginOffset
     attrs: {
       ...schemaAttrs,
       groupTransform,
-      shapes,
+      shapes: allShapes,
       size,
       padding,
-      marginOffset
+      marginOffset,
+      anchorData,
+      wrap: wrap2,
+      originalAttributes: node?.attributes
     }
   };
   return result;
 };
-const getRectangleShape = (params, node) => {
+function extractTextFromTextBox(textBoxContent, bodyPr) {
+  if (!textBoxContent || !textBoxContent.elements) return null;
+  const paragraphs = textBoxContent.elements.filter((el) => el.name === "w:p");
+  const textParts = [];
+  let horizontalAlign = null;
+  paragraphs.forEach((paragraph, paragraphIndex) => {
+    if (!horizontalAlign) {
+      const pPr = paragraph.elements?.find((el) => el.name === "w:pPr");
+      const jc = pPr?.elements?.find((el) => el.name === "w:jc");
+      if (jc) {
+        const jcVal = jc.attributes?.["val"] || jc.attributes?.["w:val"];
+        if (jcVal === "left" || jcVal === "start") horizontalAlign = "left";
+        else if (jcVal === "right" || jcVal === "end") horizontalAlign = "right";
+        else if (jcVal === "center") horizontalAlign = "center";
+      }
+    }
+    const runs = paragraph.elements?.filter((el) => el.name === "w:r") || [];
+    let paragraphHasText = false;
+    runs.forEach((run2) => {
+      const textEl = run2.elements?.find((el) => el.name === "w:t");
+      if (textEl && textEl.elements) {
+        const text = textEl.elements.find((el) => el.type === "text");
+        if (text) {
+          paragraphHasText = true;
+          const cleanedText = typeof text.text === "string" ? text.text.replace(/\[\[sdspace\]\]/g, " ") : text.text;
+          const rPr = run2.elements?.find((el) => el.name === "w:rPr");
+          const formatting = {};
+          if (rPr) {
+            const bold = rPr.elements?.find((el) => el.name === "w:b");
+            const italic = rPr.elements?.find((el) => el.name === "w:i");
+            const color = rPr.elements?.find((el) => el.name === "w:color");
+            const sz = rPr.elements?.find((el) => el.name === "w:sz");
+            if (bold) formatting.bold = true;
+            if (italic) formatting.italic = true;
+            if (color) formatting.color = color.attributes?.["val"] || color.attributes?.["w:val"];
+            if (sz) {
+              const szVal = sz.attributes?.["val"] || sz.attributes?.["w:val"];
+              formatting.fontSize = parseInt(szVal, 10) / 2;
+            }
+          }
+          textParts.push({
+            text: cleanedText,
+            formatting
+          });
+        }
+      }
+    });
+    if (paragraphIndex < paragraphs.length - 1) {
+      textParts.push({
+        text: "\n",
+        formatting: {},
+        isLineBreak: true,
+        isEmptyParagraph: !paragraphHasText
+        // Mark empty paragraphs for extra spacing
+      });
+    }
+  });
+  if (textParts.length === 0) return null;
+  const bodyPrAttrs = bodyPr?.attributes || {};
+  let verticalAlign = "center";
+  const anchorAttr = bodyPrAttrs["anchor"];
+  if (anchorAttr === "t") verticalAlign = "top";
+  else if (anchorAttr === "ctr") verticalAlign = "center";
+  else if (anchorAttr === "b") verticalAlign = "bottom";
+  const EMU_TO_PX = 96 / 914400;
+  const DEFAULT_HORIZONTAL_INSET_EMU = 91440;
+  const DEFAULT_VERTICAL_INSET_EMU = 45720;
+  const lIns = bodyPrAttrs["lIns"] != null ? parseFloat(bodyPrAttrs["lIns"]) : DEFAULT_HORIZONTAL_INSET_EMU;
+  const tIns = bodyPrAttrs["tIns"] != null ? parseFloat(bodyPrAttrs["tIns"]) : DEFAULT_VERTICAL_INSET_EMU;
+  const rIns = bodyPrAttrs["rIns"] != null ? parseFloat(bodyPrAttrs["rIns"]) : DEFAULT_HORIZONTAL_INSET_EMU;
+  const bIns = bodyPrAttrs["bIns"] != null ? parseFloat(bodyPrAttrs["bIns"]) : DEFAULT_VERTICAL_INSET_EMU;
+  const insets = {
+    top: tIns * EMU_TO_PX,
+    right: rIns * EMU_TO_PX,
+    bottom: bIns * EMU_TO_PX,
+    left: lIns * EMU_TO_PX
+  };
+  const wrap2 = bodyPrAttrs["wrap"] || "square";
+  return {
+    parts: textParts,
+    horizontalAlign: horizontalAlign || "left",
+    // Default to left if not specified
+    verticalAlign,
+    insets,
+    wrap: wrap2
+  };
+}
+const getRectangleShape = (params, spPr, node, marginOffset, anchorData, wrap2, isAnchor) => {
   const schemaAttrs = {};
-  const [drawingNode] = params.nodes;
+  const drawingNode = params.nodes?.[0];
   if (drawingNode?.name === DRAWING_XML_TAG) {
     schemaAttrs.drawingContent = drawingNode;
   }
-  const xfrm = node.elements.find((el) => el.name === "a:xfrm");
-  const start = xfrm.elements.find((el) => el.name === "a:off");
-  const size = xfrm.elements.find((el) => el.name === "a:ext");
-  const solidFill = node.elements.find((el) => el.name === "a:solidFill");
-  const rectangleSize = {
-    top: emuToPixels(start.attributes["y"]),
-    left: emuToPixels(start.attributes["x"]),
-    width: emuToPixels(size.attributes["cx"]),
-    height: emuToPixels(size.attributes["cy"])
-  };
-  schemaAttrs.size = rectangleSize;
+  const xfrm = spPr?.elements?.find((el) => el.name === "a:xfrm");
+  const start = xfrm?.elements?.find((el) => el.name === "a:off");
+  const size = xfrm?.elements?.find((el) => el.name === "a:ext");
+  const solidFill = spPr?.elements?.find((el) => el.name === "a:solidFill");
+  if (start && size) {
+    const rectangleSize = {
+      top: emuToPixels(start.attributes?.["y"] || 0),
+      left: emuToPixels(start.attributes?.["x"] || 0),
+      width: emuToPixels(size.attributes?.["cx"] || 0),
+      height: emuToPixels(size.attributes?.["cy"] || 0)
+    };
+    schemaAttrs.size = rectangleSize;
+  }
   const background = solidFill?.elements[0]?.attributes["val"];
   if (background) {
     schemaAttrs.background = "#" + background;
   }
   return {
     type: "contentBlock",
-    attrs: schemaAttrs
+    attrs: {
+      ...schemaAttrs,
+      marginOffset,
+      anchorData,
+      wrap: wrap2,
+      isAnchor,
+      originalAttributes: node?.attributes
+    }
   };
 };
 const buildShapePlaceholder = (node, size, padding, marginOffset, shapeType) => {
@@ -25212,7 +25484,7 @@ const buildShapePlaceholder = (node, size, padding, marginOffset, shapeType) =>
     attrs
   };
 };
-function getVectorShape({ params, graphicData }) {
+function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap2, isAnchor }) {
   const schemaAttrs = {};
   const drawingNode = params.nodes?.[0];
   if (drawingNode?.name === "w:drawing") {
@@ -25232,10 +25504,9 @@ function getVectorShape({ params, graphicData }) {
     console.warn("Shape kind not found");
   }
   schemaAttrs.kind = shapeKind;
+  const width = size?.width ?? DEFAULT_SHAPE_WIDTH;
+  const height = size?.height ?? DEFAULT_SHAPE_HEIGHT;
   const xfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
-  const extent = xfrm?.elements?.find((el) => el.name === "a:ext");
-  const width = extent?.attributes?.["cx"] ? emuToPixels(extent.attributes["cx"]) : 100;
-  const height = extent?.attributes?.["cy"] ? emuToPixels(extent.attributes["cy"]) : 100;
   const rotation = xfrm?.attributes?.["rot"] ? rotToDegrees(xfrm.attributes["rot"]) : 0;
   const flipH = xfrm?.attributes?.["flipH"] === "1";
   const flipV = xfrm?.attributes?.["flipV"] === "1";
@@ -25243,6 +25514,15 @@ function getVectorShape({ params, graphicData }) {
   const fillColor = extractFillColor(spPr, style);
   const strokeColor = extractStrokeColor(spPr, style);
   const strokeWidth = extractStrokeWidth(spPr);
+  const textBox = wsp.elements?.find((el) => el.name === "wps:txbx");
+  const textBoxContent = textBox?.elements?.find((el) => el.name === "w:txbxContent");
+  const bodyPr = wsp.elements?.find((el) => el.name === "wps:bodyPr");
+  let textContent = null;
+  let textAlign = "left";
+  if (textBoxContent) {
+    textContent = extractTextFromTextBox(textBoxContent, bodyPr);
+    textAlign = textContent?.horizontalAlign || "left";
+  }
   return {
     type: "vectorShape",
     attrs: {
@@ -25254,7 +25534,16 @@ function getVectorShape({ params, graphicData }) {
       flipV,
       fillColor,
       strokeColor,
-      strokeWidth
+      strokeWidth,
+      marginOffset,
+      anchorData,
+      wrap: wrap2,
+      isAnchor,
+      textContent,
+      textAlign,
+      textVerticalAlign: textContent?.verticalAlign,
+      textInsets: textContent?.insets,
+      originalAttributes: node?.attributes
     }
   };
 }
@@ -31148,16 +31437,24 @@ function translateFieldAnnotation(params) {
     hash: attrs.hash
   };
   const annotationAttrsJson = JSON.stringify(annotationAttrs);
+  const sdtPrElements = [
+    { name: "w:alias", attributes: { "w:val": attrs.displayLabel } },
+    { name: "w:tag", attributes: { "w:val": annotationAttrsJson } },
+    { name: "w:id", attributes: { "w:val": id } }
+  ];
+  if (attrs.sdtPr?.elements && Array.isArray(attrs.sdtPr.elements)) {
+    const elementsToExclude = ["w:alias", "w:tag", "w:id"];
+    const passthroughElements = attrs.sdtPr.elements.filter(
+      (el) => el && el.name && !elementsToExclude.includes(el.name)
+    );
+    sdtPrElements.push(...passthroughElements);
+  }
   const result = {
     name: "w:sdt",
     elements: [
       {
         name: "w:sdtPr",
-        elements: [
-          { name: "w:alias", attributes: { "w:val": attrs.displayLabel } },
-          { name: "w:tag", attributes: { "w:val": annotationAttrsJson } },
-          { name: "w:id", attributes: { "w:val": id } }
-        ]
+        elements: sdtPrElements
       },
       {
         name: "w:sdtContent",
@@ -31389,7 +31686,7 @@ function translateDocumentSection(params) {
     type: "documentSection",
     description: attrs.description
   });
-  const sdtPr = generateSdtPrTagForDocumentSection(attrs.id, attrs.title, exportedTag);
+  const sdtPr = generateSdtPrTagForDocumentSection(attrs.id, attrs.title, exportedTag, attrs.sdtPr);
   const { isLocked } = attrs;
   if (isLocked) {
     sdtPr.elements.push({
@@ -31406,73 +31703,115 @@ function translateDocumentSection(params) {
   };
   return result;
 }
-const generateSdtPrTagForDocumentSection = (id, title, tag) => {
+const generateSdtPrTagForDocumentSection = (id, title, tag, sdtPr) => {
+  const coreElements = [
+    {
+      name: "w:id",
+      attributes: {
+        "w:val": id
+      }
+    },
+    {
+      name: "w:alias",
+      attributes: {
+        "w:val": title
+      }
+    },
+    {
+      name: "w:tag",
+      attributes: {
+        "w:val": tag
+      }
+    }
+  ];
+  if (sdtPr?.elements && Array.isArray(sdtPr.elements)) {
+    const elementsToExclude = ["w:id", "w:alias", "w:tag", "w:lock"];
+    const passthroughElements = sdtPr.elements.filter((el) => el && el.name && !elementsToExclude.includes(el.name));
+    coreElements.push(...passthroughElements);
+  }
   return {
     name: "w:sdtPr",
-    elements: [
-      {
-        name: "w:id",
-        attributes: {
-          "w:val": id
-        }
-      },
-      {
-        name: "w:alias",
-        attributes: {
-          "w:val": title
-        }
-      },
-      {
-        name: "w:tag",
-        attributes: {
-          "w:val": tag
-        }
-      }
-    ]
+    elements: coreElements
   };
 };
 function translateDocumentPartObj(params) {
   const { node } = params;
   const { attrs = {} } = node;
   const childContent = translateChildNodes({ ...params, nodes: node.content });
+  const sdtPr = generateSdtPrForDocPartObj(attrs);
   const nodeElements = [
+    sdtPr,
     {
+      name: "w:sdtContent",
+      elements: childContent
+    }
+  ];
+  const result = {
+    name: "w:sdt",
+    elements: nodeElements
+  };
+  return result;
+}
+function generateSdtPrForDocPartObj(attrs) {
+  const existingDocPartObj = attrs.sdtPr?.elements?.find((el) => el.name === "w:docPartObj");
+  const existingDocPartGallery = existingDocPartObj?.elements?.find((el) => el.name === "w:docPartGallery")?.attributes?.["w:val"];
+  const docPartGallery = attrs.docPartGallery ?? existingDocPartGallery ?? null;
+  const id = attrs.id ?? attrs.sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes?.["w:val"] ?? "";
+  const docPartUnique = attrs.docPartUnique ?? existingDocPartObj?.elements?.some((el) => el.name === "w:docPartUnique") ?? false;
+  if (docPartGallery === null) {
+    if (attrs.sdtPr) {
+      return attrs.sdtPr;
+    }
+    return {
       name: "w:sdtPr",
       elements: [
         {
           name: "w:id",
           attributes: {
-            "w:val": attrs.id
+            "w:val": id
           }
         },
         {
           name: "w:docPartObj",
-          elements: [
-            {
-              name: "w:docPartGallery",
-              attributes: {
-                "w:val": attrs.docPartGallery
-              }
-            },
-            ...attrs.docPartUnique ? [
-              {
-                name: "w:docPartUnique"
-              }
-            ] : []
-          ]
+          elements: []
         }
       ]
+    };
+  }
+  const docPartObjElements = [
+    {
+      name: "w:docPartGallery",
+      attributes: {
+        "w:val": docPartGallery
+      }
+    }
+  ];
+  if (docPartUnique) {
+    docPartObjElements.push({ name: "w:docPartUnique" });
+  }
+  const sdtPrElements = [
+    {
+      name: "w:id",
+      attributes: {
+        "w:val": id
+      }
     },
     {
-      name: "w:sdtContent",
-      elements: childContent
+      name: "w:docPartObj",
+      elements: docPartObjElements
     }
   ];
-  const result = {
-    name: "w:sdt",
-    elements: nodeElements
+  if (attrs.sdtPr?.elements && Array.isArray(attrs.sdtPr.elements)) {
+    const elementsToExclude = ["w:id", "w:docPartObj"];
+    const passthroughElements = attrs.sdtPr.elements.filter(
+      (el) => el && el.name && !elementsToExclude.includes(el.name)
+    );
+    sdtPrElements.push(...passthroughElements);
+  }
+  return {
+    name: "w:sdtPr",
+    elements: sdtPrElements
   };
-  return result;
 }
 const RUN_LEVEL_WRAPPERS = /* @__PURE__ */ new Set(["w:hyperlink", "w:ins", "w:del"]);
 function convertSdtContentToRuns(elements) {
@@ -34303,6 +34642,79 @@ const _processCombinedNodesForFldChar = (nodesToCombine = [], instrText, docx) =
     return nodesToCombine;
   }
 };
+const preProcessPageFieldsOnly = (nodes = []) => {
+  const processedNodes = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const fldCharEl = node.elements?.find((el) => el.name === "w:fldChar");
+    const fldType = fldCharEl?.attributes?.["w:fldCharType"];
+    if (fldType === "begin") {
+      const fieldInfo = scanFieldSequence(nodes, i);
+      if (fieldInfo && (fieldInfo.fieldType === "PAGE" || fieldInfo.fieldType === "NUMPAGES")) {
+        const preprocessor = fieldInfo.fieldType === "PAGE" ? preProcessPageInstruction : preProcessNumPagesInstruction;
+        const contentNodes = fieldInfo.contentNodes;
+        const processedField = preprocessor(contentNodes, fieldInfo.instrText);
+        processedNodes.push(...processedField);
+        i = fieldInfo.endIndex + 1;
+        continue;
+      } else {
+        if (fieldInfo) {
+          for (let j2 = i; j2 <= fieldInfo.endIndex; j2++) {
+            const passNode = nodes[j2];
+            if (Array.isArray(passNode.elements)) {
+              const childResult = preProcessPageFieldsOnly(passNode.elements);
+              passNode.elements = childResult.processedNodes;
+            }
+            processedNodes.push(passNode);
+          }
+          i = fieldInfo.endIndex + 1;
+          continue;
+        }
+      }
+    }
+    if (Array.isArray(node.elements)) {
+      const childResult = preProcessPageFieldsOnly(node.elements);
+      node.elements = childResult.processedNodes;
+    }
+    processedNodes.push(node);
+    i++;
+  }
+  return { processedNodes };
+};
+function scanFieldSequence(nodes, beginIndex) {
+  let instrText = "";
+  let separateIndex = -1;
+  let endIndex = -1;
+  const contentNodes = [];
+  for (let i = beginIndex + 1; i < nodes.length; i++) {
+    const node = nodes[i];
+    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");
+    if (instrTextEl) {
+      instrText += (instrTextEl.elements?.[0]?.text || "") + " ";
+    }
+    if (fldType === "separate") {
+      separateIndex = i;
+    } else if (fldType === "end") {
+      endIndex = i;
+      break;
+    } else if (separateIndex !== -1 && fldType !== "begin") {
+      contentNodes.push(node);
+    }
+  }
+  if (endIndex === -1) {
+    return null;
+  }
+  const fieldType = instrText.trim().split(" ")[0];
+  return {
+    fieldType,
+    instrText: instrText.trim(),
+    contentNodes,
+    endIndex
+  };
+}
 const createDocumentJson = (docx, converter, editor) => {
   const json = carbonCopy(getInitialJSON(docx));
   if (!json) return null;
@@ -34699,6 +35111,8 @@ const importHeadersFooters = (docx, converter, mainEditor) => {
   editor.options.annotations = true;
   headers.forEach((header) => {
     const { rId, referenceFile, currentFileName } = getHeaderFooterSectionData(header, docx);
+    const { processedNodes: headerProcessedNodes } = preProcessPageFieldsOnly(referenceFile.elements[0].elements ?? []);
+    referenceFile.elements[0].elements = headerProcessedNodes;
     const sectPrHeader = allSectPrElements.find(
       (el) => el.name === "w:headerReference" && el.attributes["r:id"] === rId
     );
@@ -34727,6 +35141,8 @@ const importHeadersFooters = (docx, converter, mainEditor) => {
   if (titlePg) converter.headerIds.titlePg = true;
   footers.forEach((footer) => {
     const { rId, referenceFile, currentFileName } = getHeaderFooterSectionData(footer, docx);
+    const { processedNodes: footerProcessedNodes } = preProcessPageFieldsOnly(referenceFile.elements[0].elements ?? []);
+    referenceFile.elements[0].elements = footerProcessedNodes;
     const sectPrFooter = allSectPrElements.find(
       (el) => el.name === "w:footerReference" && el.attributes["r:id"] === rId
     );
@@ -35869,7 +36285,7 @@ const _SuperConverter = class _SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.0.0-beta.13") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.0.0-beta.14") {
     return _SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**