@harbour-enterprises/superdoc 0.24.0-next.4 → 0.24.0-next.6

package/dist/super-editor/chunks/{converter-DpPj67OW.js → converter-CI3WqmGV.js}

@@ -15074,6 +15074,7 @@ async function readFromClipboard(state2) {
   }
   return content;
 }
+const PIXELS_PER_INCH = 96;
 function inchesToTwips(inches) {
   if (inches == null) return;
   if (typeof inches === "string") inches = parseFloat(inches);
@@ -15096,12 +15097,12 @@ function pixelsToTwips(pixels) {
 }
 function inchesToPixels(inches) {
   if (inches == null) return;
-  const pixels = inches * 96;
+  const pixels = inches * PIXELS_PER_INCH;
   return Math.round(pixels * 1e3) / 1e3;
 }
 function pixelsToInches(pixels) {
   if (pixels == null) return;
-  const inches = Number(pixels) / 96;
+  const inches = Number(pixels) / PIXELS_PER_INCH;
   return inches;
 }
 function twipsToLines(twips) {
@@ -15119,7 +15120,7 @@ function halfPointToPoints(halfPoints) {
 function emuToPixels(emu) {
   if (emu == null) return;
   if (typeof emu === "string") emu = parseFloat(emu);
-  const pixels = emu * 96 / 914400;
+  const pixels = emu * PIXELS_PER_INCH / 914400;
   return Math.round(pixels);
 }
 function pixelsToEmu(px) {
@@ -15155,12 +15156,12 @@ function degreesToRot(degrees) {
 }
 function pixelsToPolygonUnits(pixels) {
   if (pixels == null) return;
-  const pu = pixels * 96;
+  const pu = pixels * PIXELS_PER_INCH;
   return Math.round(pu);
 }
 function polygonUnitsToPixels(pu) {
   if (pu == null) return;
-  const pixels = Number(pu) / 96;
+  const pixels = Number(pu) / PIXELS_PER_INCH;
   return Math.round(pixels * 1e3) / 1e3;
 }
 function polygonToObj(polygonNode) {
@@ -27045,6 +27046,68 @@ const translator$_ = NodeTranslator.from(
     repeatHeader: false
   })
 );
+const createPlaceholderCell = (gridWidth, reason) => {
+  const safeWidth = Number.isFinite(gridWidth) ? gridWidth : 0;
+  const noBorder = { val: "none", size: 0 };
+  return {
+    type: "tableCell",
+    attrs: {
+      colspan: 1,
+      rowspan: 1,
+      colwidth: [safeWidth],
+      __placeholder: reason,
+      borders: {
+        top: { ...noBorder },
+        right: { ...noBorder },
+        bottom: { ...noBorder },
+        left: { ...noBorder }
+      }
+    },
+    content: [{ type: "paragraph", content: [] }]
+  };
+};
+const advancePastRowSpans = (pendingRowSpans, startIndex, totalColumns) => {
+  let index2 = startIndex;
+  while (index2 < totalColumns && pendingRowSpans[index2] > 0) {
+    pendingRowSpans[index2] -= 1;
+    index2 += 1;
+  }
+  return index2;
+};
+const fillPlaceholderColumns = ({
+  content,
+  pendingRowSpans,
+  currentIndex,
+  targetIndex,
+  totalColumns,
+  gridColumnWidths,
+  reason
+}) => {
+  let index2 = currentIndex;
+  while (index2 < targetIndex && index2 < totalColumns) {
+    if (pendingRowSpans[index2] > 0) {
+      pendingRowSpans[index2] -= 1;
+      index2 += 1;
+      continue;
+    }
+    const width = Array.isArray(gridColumnWidths) ? gridColumnWidths[index2] ?? 0 : 0;
+    content.push(createPlaceholderCell(width, reason));
+    index2 += 1;
+  }
+  return index2;
+};
+const isPlaceholderCell = (cell) => {
+  if (!cell) return false;
+  if (cell.attrs?.__placeholder) return true;
+  const widths = cell.attrs?.colwidth;
+  if (Array.isArray(widths) && widths.length > 0) {
+    const hasMeaningfulWidth = widths.some(
+      (value) => typeof value === "number" && Number.isFinite(value) && Math.abs(value) > 1
+    );
+    if (!hasMeaningfulWidth) return true;
+  }
+  return false;
+};
 const XML_NODE_NAME$h = "w:tr";
 const SD_NODE_NAME$d = "tableRow";
 const validXmlAttributes$b = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
@@ -27060,29 +27123,64 @@ const encode$n = (params, encodedAttrs) => {
       nodes: [tPr]
     });
   }
+  const gridBeforeRaw = tableRowProperties?.["gridBefore"];
+  const safeGridBefore = typeof gridBeforeRaw === "number" && Number.isFinite(gridBeforeRaw) && gridBeforeRaw > 0 ? gridBeforeRaw : 0;
   encodedAttrs["tableRowProperties"] = Object.freeze(tableRowProperties);
   encodedAttrs["rowHeight"] = twipsToPixels(tableRowProperties["rowHeight"]?.value);
   encodedAttrs["cantSplit"] = tableRowProperties["cantSplit"];
-  const { columnWidths: gridColumnWidths } = params.extraParams;
+  const { columnWidths: gridColumnWidths, activeRowSpans = [] } = params.extraParams;
+  const totalColumns = Array.isArray(gridColumnWidths) ? gridColumnWidths.length : 0;
+  const pendingRowSpans = Array.isArray(activeRowSpans) ? activeRowSpans.slice() : [];
+  while (pendingRowSpans.length < totalColumns) pendingRowSpans.push(0);
   const cellNodes = row.elements.filter((el) => el.name === "w:tc");
+  const content = [];
   let currentColumnIndex = 0;
-  const content = cellNodes?.map((n) => {
-    let columnWidth = gridColumnWidths?.[currentColumnIndex] || null;
+  const fillUntil = (target, reason) => {
+    currentColumnIndex = fillPlaceholderColumns({
+      content,
+      pendingRowSpans,
+      currentIndex: currentColumnIndex,
+      targetIndex: target,
+      totalColumns,
+      gridColumnWidths,
+      reason
+    });
+  };
+  const skipOccupiedColumns = () => {
+    currentColumnIndex = advancePastRowSpans(pendingRowSpans, currentColumnIndex, totalColumns);
+  };
+  fillUntil(safeGridBefore, "gridBefore");
+  skipOccupiedColumns();
+  cellNodes?.forEach((node) => {
+    skipOccupiedColumns();
+    const startColumn = currentColumnIndex;
+    const columnWidth = gridColumnWidths?.[startColumn] || null;
     const result = translator$c.encode({
       ...params,
       extraParams: {
         ...params.extraParams,
-        node: n,
-        columnIndex: currentColumnIndex,
+        node,
+        columnIndex: startColumn,
         columnWidth
       }
     });
-    const tcPr = n.elements?.find((el) => el.name === "w:tcPr");
-    const colspanTag = tcPr?.elements?.find((el) => el.name === "w:gridSpan");
-    const colspan = parseInt(colspanTag?.attributes["w:val"] || 1, 10);
-    currentColumnIndex += colspan;
-    return result;
-  }) || [];
+    if (result) {
+      content.push(result);
+      const colspan = Math.max(1, result.attrs?.colspan || 1);
+      const rowspan = Math.max(1, result.attrs?.rowspan || 1);
+      if (rowspan > 1) {
+        for (let offset = 0; offset < colspan; offset += 1) {
+          const target = startColumn + offset;
+          if (target < pendingRowSpans.length) {
+            pendingRowSpans[target] = Math.max(pendingRowSpans[target], rowspan - 1);
+          }
+        }
+      }
+      currentColumnIndex = startColumn + colspan;
+    }
+  });
+  skipOccupiedColumns();
+  fillUntil(totalColumns, "gridAfter");
   const newNode = {
     type: "tableRow",
     content,
@@ -27092,9 +27190,37 @@ const encode$n = (params, encodedAttrs) => {
 };
 const decode$p = (params, decodedAttrs) => {
   const { node } = params;
-  const elements = translateChildNodes(params);
+  const cells = node.content || [];
+  let leadingPlaceholders = 0;
+  while (leadingPlaceholders < cells.length && isPlaceholderCell(cells[leadingPlaceholders])) {
+    leadingPlaceholders += 1;
+  }
+  let trailingPlaceholders = 0;
+  while (trailingPlaceholders < cells.length - leadingPlaceholders && isPlaceholderCell(cells[cells.length - 1 - trailingPlaceholders])) {
+    trailingPlaceholders += 1;
+  }
+  const trimmedSlice = cells.slice(leadingPlaceholders, cells.length - trailingPlaceholders);
+  const sanitizedCells = trimmedSlice.map((cell) => {
+    if (cell?.attrs && "__placeholder" in cell.attrs) {
+      const { __placeholder, ...rest } = cell.attrs;
+      return { ...cell, attrs: rest };
+    }
+    return cell;
+  });
+  const trimmedContent = sanitizedCells.filter((_2, index2) => !isPlaceholderCell(trimmedSlice[index2]));
+  const translateParams = {
+    ...params,
+    node: { ...node, content: trimmedContent }
+  };
+  const elements = translateChildNodes(translateParams);
   if (node.attrs?.tableRowProperties) {
     const tableRowProperties = { ...node.attrs.tableRowProperties };
+    if (leadingPlaceholders > 0) {
+      tableRowProperties.gridBefore = leadingPlaceholders;
+    }
+    if (trailingPlaceholders > 0) {
+      tableRowProperties.gridAfter = trailingPlaceholders;
+    }
     if (node.attrs.rowHeight != null) {
       const rowHeightPixels = twipsToPixels(node.attrs.tableRowProperties["rowHeight"]?.value);
       if (rowHeightPixels !== node.attrs.rowHeight) {
@@ -27324,17 +27450,21 @@ const decode$o = (params) => {
   const fallbackColumnWidthTwips = resolveFallbackColumnWidthTwips(params, totalColumns, cellMinWidth);
   const elements = [];
   let columnIndex = 0;
-  const pushColumn = (widthTwips) => {
+  const pushColumn = (widthTwips, { enforceMinimum = false } = {}) => {
     let numericWidth = typeof widthTwips === "string" ? parseInt(widthTwips, 10) : widthTwips;
+    let shouldEnforceMinimum = enforceMinimum;
     if (numericWidth == null || Number.isNaN(numericWidth) || numericWidth <= 0) {
       numericWidth = fallbackColumnWidthTwips;
+      shouldEnforceMinimum = true;
     }
-    numericWidth = Math.max(numericWidth, cellMinWidth);
+    const roundedWidth = Math.round(numericWidth);
+    const minimumWidth = shouldEnforceMinimum ? cellMinWidth : 1;
+    const safeWidth = Math.max(roundedWidth, minimumWidth);
     const decoded = translator$u.decode({
       node: { type: (
         /** @type {string} */
         translator$u.sdNodeOrKeyName
-      ), attrs: { col: numericWidth } }
+      ), attrs: { col: safeWidth } }
     });
     if (decoded) elements.push(decoded);
   };
@@ -27342,13 +27472,17 @@ const decode$o = (params) => {
     const { colspan = 1, colwidth } = cell?.attrs || {};
     const spanCount = Math.max(1, colspan);
     for (let span = 0; span < spanCount; span++) {
-      const cellWidthPixels = Array.isArray(colwidth) ? colwidth[span] : void 0;
+      const rawWidth = Array.isArray(colwidth) ? colwidth[span] : void 0;
+      const cellWidthPixels = typeof rawWidth === "number" && Number.isFinite(rawWidth) ? rawWidth : Number(rawWidth);
+      const hasCellWidth = Number.isFinite(cellWidthPixels) && cellWidthPixels > 0;
       const colGridAttrs = grid?.[columnIndex] || {};
       const gridWidthTwips = normalizeTwipWidth(colGridAttrs.col);
       const gridWidthPixels = gridWidthTwips != null ? twipsToPixels(gridWidthTwips) : null;
       let cellWidthTwips;
-      if (cellWidthPixels != null) {
-        if (gridWidthTwips != null && gridWidthPixels === cellWidthPixels) {
+      let enforceMinimum = false;
+      if (hasCellWidth) {
+        const tolerance = 0.5;
+        if (gridWidthTwips != null && gridWidthPixels != null && Math.abs(gridWidthPixels - cellWidthPixels) <= tolerance) {
           cellWidthTwips = gridWidthTwips;
         } else {
           cellWidthTwips = pixelsToTwips(cellWidthPixels);
@@ -27357,8 +27491,9 @@ const decode$o = (params) => {
         cellWidthTwips = gridWidthTwips;
       } else {
         cellWidthTwips = fallbackColumnWidthTwips;
+        enforceMinimum = true;
       }
-      pushColumn(cellWidthTwips);
+      pushColumn(cellWidthTwips, { enforceMinimum });
       columnIndex++;
     }
   });
@@ -27521,7 +27656,9 @@ const encode$l = (params, encodedAttrs) => {
     }
   }
   const content = [];
-  rows.forEach((row) => {
+  const totalColumns = columnWidths.length;
+  const activeRowSpans = totalColumns > 0 ? new Array(totalColumns).fill(0) : [];
+  rows.forEach((row, rowIndex) => {
     const result = translator$Z.encode({
       ...params,
       nodes: [row],
@@ -27530,10 +27667,45 @@ const encode$l = (params, encodedAttrs) => {
         table: node,
         rowBorders: borderRowData,
         styleTag: tblStyleTag,
-        columnWidths
+        columnWidths,
+        activeRowSpans: activeRowSpans.slice(),
+        rowIndex
       }
     });
-    if (result) content.push(result);
+    if (result) {
+      content.push(result);
+      if (totalColumns > 0) {
+        const activeRowSpansForCurrentRow = activeRowSpans.slice();
+        for (let col = 0; col < totalColumns; col++) {
+          if (activeRowSpans[col] > 0) {
+            activeRowSpans[col] -= 1;
+          }
+        }
+        let columnIndex = 0;
+        const advanceColumnIndex = () => {
+          while (columnIndex < totalColumns && activeRowSpansForCurrentRow[columnIndex] > 0) {
+            columnIndex += 1;
+          }
+        };
+        advanceColumnIndex();
+        result.content?.forEach((cell) => {
+          advanceColumnIndex();
+          const colspan = Math.max(1, cell.attrs?.colspan || 1);
+          const rowspan = Math.max(1, cell.attrs?.rowspan || 1);
+          if (rowspan > 1) {
+            for (let offset = 0; offset < colspan && columnIndex + offset < totalColumns; offset++) {
+              const targetIndex = columnIndex + offset;
+              const remainingRows = rowspan - 1;
+              if (remainingRows > 0 && remainingRows > activeRowSpans[targetIndex]) {
+                activeRowSpans[targetIndex] = remainingRows;
+              }
+            }
+          }
+          columnIndex += colspan;
+          advanceColumnIndex();
+        });
+      }
+    }
   });
   return {
     type: "table",
@@ -27938,14 +28110,104 @@ function handleTableCellNode({
   }
   return {
     type: "tableCell",
-    content: nodeListHandler.handler({
-      ...params,
-      nodes: node.elements,
-      path: [...params.path || [], node]
-    }),
+    content: normalizeTableCellContent(
+      nodeListHandler.handler({
+        ...params,
+        nodes: node.elements,
+        path: [...params.path || [], node]
+      }),
+      params.editor
+    ),
     attrs: attributes
   };
 }
+function normalizeTableCellContent(content, editor) {
+  if (!Array.isArray(content) || content.length === 0) return content;
+  const normalized = [];
+  const pendingForNextBlock = [];
+  const schema = editor?.schema;
+  const cloneBlock = (node) => {
+    if (!node) return node;
+    const cloned = { ...node };
+    if (Array.isArray(node.content)) {
+      cloned.content = [...node.content];
+    }
+    return cloned;
+  };
+  const ensureArray = (node) => {
+    if (!Array.isArray(node.content)) {
+      node.content = [];
+    }
+    return node.content;
+  };
+  const isInlineNode = (node) => {
+    if (!node || typeof node.type !== "string") return false;
+    if (node.type === "text") return true;
+    if (node.type === "bookmarkStart" || node.type === "bookmarkEnd") return true;
+    const nodeType = schema?.nodes?.[node.type];
+    if (nodeType) {
+      if (typeof nodeType.isInline === "boolean") return nodeType.isInline;
+      if (nodeType.spec?.group && typeof nodeType.spec.group === "string") {
+        return nodeType.spec.group.split(" ").includes("inline");
+      }
+    }
+    return false;
+  };
+  for (const node of content) {
+    if (!node || typeof node.type !== "string") {
+      normalized.push(node);
+      continue;
+    }
+    if (!isInlineNode(node)) {
+      const blockNode = cloneBlock(node);
+      if (pendingForNextBlock.length) {
+        const blockContent = ensureArray(blockNode);
+        const leadingInline = pendingForNextBlock.splice(0);
+        blockNode.content = [...leadingInline, ...blockContent];
+      } else if (Array.isArray(blockNode.content)) {
+        blockNode.content = [...blockNode.content];
+      }
+      normalized.push(blockNode);
+      continue;
+    }
+    const targetIsNextBlock = node.type === "bookmarkStart" || normalized.length === 0;
+    if (targetIsNextBlock) {
+      pendingForNextBlock.push(node);
+    } else {
+      const lastIndex = normalized.length - 1;
+      const lastNode = normalized[lastIndex];
+      if (!lastNode || typeof lastNode.type !== "string" || isInlineNode(lastNode)) {
+        pendingForNextBlock.push(node);
+        continue;
+      }
+      const blockContent = ensureArray(lastNode);
+      if (pendingForNextBlock.length) {
+        blockContent.push(...pendingForNextBlock.splice(0));
+      }
+      blockContent.push(node);
+    }
+  }
+  if (pendingForNextBlock.length) {
+    if (normalized.length) {
+      const lastIndex = normalized.length - 1;
+      const lastNode = normalized[lastIndex];
+      if (lastNode && typeof lastNode.type === "string" && !isInlineNode(lastNode)) {
+        const blockContent = ensureArray(lastNode);
+        blockContent.push(...pendingForNextBlock);
+        pendingForNextBlock.length = 0;
+      }
+    }
+    if (pendingForNextBlock.length) {
+      normalized.push({
+        type: "paragraph",
+        attrs: {},
+        content: [...pendingForNextBlock]
+      });
+      pendingForNextBlock.length = 0;
+    }
+  }
+  return normalized;
+}
 const processInlineCellBorders = (borders, rowBorders) => {
   if (!borders) return null;
   return ["bottom", "top", "left", "right"].reduce((acc, direction) => {
@@ -28499,6 +28761,7 @@ function sdtNodeTypeStrategy(node) {
   }
   return { type: "unknown", handler: null };
 }
+const DRAWING_XML_TAG = "w:drawing";
 function handleImageNode(node, params, isAnchor) {
   const { docx, filename } = params;
   const { attributes } = node;
@@ -28510,32 +28773,10 @@ function handleImageNode(node, params, isAnchor) {
   };
   const extent = node.elements.find((el) => el.name === "wp:extent");
   const size = {
-    width: emuToPixels(extent.attributes?.cx),
-    height: emuToPixels(extent.attributes?.cy)
+    width: emuToPixels(extent?.attributes?.cx),
+    height: emuToPixels(extent?.attributes?.cy)
   };
-  const graphic = node.elements.find((el) => el.name === "a:graphic");
-  const graphicData = graphic.elements.find((el) => el.name === "a:graphicData");
-  const { uri: uri2 } = graphicData?.attributes || {};
-  const shapeURI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
-  if (!!uri2 && uri2 === shapeURI) {
-    return handleShapeDrawing(params, node, graphicData);
-  }
-  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");
-  const spPr = picture.elements.find((el) => el.name === "pic:spPr");
   let transformData = {};
-  if (spPr) {
-    const xfrm = spPr.elements.find((el) => el.name === "a:xfrm");
-    if (xfrm?.attributes) {
-      transformData = {
-        rotation: rotToDegrees(xfrm.attributes["rot"]),
-        verticalFlip: xfrm.attributes["flipV"] === "1",
-        horizontalFlip: xfrm.attributes["flipH"] === "1"
-      };
-    }
-  }
   const effectExtent = node.elements.find((el) => el.name === "wp:effectExtent");
   if (effectExtent) {
     const sanitizeEmuValue = (value) => {
@@ -28544,22 +28785,26 @@ function handleImageNode(node, params, isAnchor) {
       return Number.isFinite(numeric) ? numeric : 0;
     };
     transformData.sizeExtension = {
-      left: emuToPixels(sanitizeEmuValue(effectExtent.attributes["l"])),
-      top: emuToPixels(sanitizeEmuValue(effectExtent.attributes["t"])),
-      right: emuToPixels(sanitizeEmuValue(effectExtent.attributes["r"])),
-      bottom: emuToPixels(sanitizeEmuValue(effectExtent.attributes["b"]))
+      left: emuToPixels(sanitizeEmuValue(effectExtent.attributes?.["l"])),
+      top: emuToPixels(sanitizeEmuValue(effectExtent.attributes?.["t"])),
+      right: emuToPixels(sanitizeEmuValue(effectExtent.attributes?.["r"])),
+      bottom: emuToPixels(sanitizeEmuValue(effectExtent.attributes?.["b"]))
     };
   }
   const positionHTag = node.elements.find((el) => el.name === "wp:positionH");
   const positionH = positionHTag?.elements.find((el) => el.name === "wp:posOffset");
   const positionHValue = emuToPixels(positionH?.elements[0]?.text);
-  const hRelativeFrom = positionHTag?.attributes.relativeFrom;
-  const alignH = positionHTag?.elements.find((el) => el.name === "wp:align")?.elements[0]?.text;
+  const hRelativeFrom = positionHTag?.attributes?.relativeFrom;
+  const alignH = positionHTag?.elements.find((el) => el.name === "wp:align")?.elements?.[0]?.text;
   const positionVTag = node.elements.find((el) => el.name === "wp:positionV");
   const positionV = positionVTag?.elements?.find((el) => el.name === "wp:posOffset");
   const positionVValue = emuToPixels(positionV?.elements[0]?.text);
-  const vRelativeFrom = positionVTag?.attributes.relativeFrom;
-  const alignV = positionVTag?.elements?.find((el) => el.name === "wp:align")?.elements[0]?.text;
+  const vRelativeFrom = positionVTag?.attributes?.relativeFrom;
+  const alignV = positionVTag?.elements?.find((el) => el.name === "wp:align")?.elements?.[0]?.text;
+  const marginOffset = {
+    horizontal: positionHValue,
+    top: positionVValue
+  };
   const simplePos = node.elements.find((el) => el.name === "wp:simplePos");
   const wrapNode = isAnchor ? node.elements.find(
     (el) => ["wp:wrapNone", "wp:wrapSquare", "wp:wrapThrough", "wp:wrapTight", "wp:wrapTopAndBottom"].includes(el.name)
@@ -28567,38 +28812,40 @@ function handleImageNode(node, params, isAnchor) {
   const wrap2 = isAnchor ? { type: wrapNode?.name.slice(7) || "None", attrs: {} } : { type: "Inline" };
   switch (wrap2.type) {
     case "Square":
-      wrap2.attrs.wrapText = wrapNode.attributes.wrapText;
-      if ("distB" in (wrapNode.attributes || {})) {
+      if (wrapNode?.attributes?.wrapText) {
+        wrap2.attrs.wrapText = wrapNode.attributes.wrapText;
+      }
+      if ("distB" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distBottom = emuToPixels(wrapNode.attributes.distB);
       }
-      if ("distL" in (wrapNode.attributes || {})) {
+      if ("distL" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distLeft = emuToPixels(wrapNode.attributes.distL);
       }
-      if ("distR" in (wrapNode.attributes || {})) {
+      if ("distR" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distRight = emuToPixels(wrapNode.attributes.distR);
       }
-      if ("distT" in (wrapNode.attributes || {})) {
+      if ("distT" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distTop = emuToPixels(wrapNode.attributes.distT);
       }
       break;
     case "Tight":
     case "Through": {
-      if ("distL" in (wrapNode.attributes || {})) {
+      if ("distL" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distLeft = emuToPixels(wrapNode.attributes.distL);
       }
-      if ("distR" in (wrapNode.attributes || {})) {
+      if ("distR" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distRight = emuToPixels(wrapNode.attributes.distR);
       }
-      if ("distT" in (wrapNode.attributes || {})) {
+      if ("distT" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distTop = emuToPixels(wrapNode.attributes.distT);
       }
-      if ("distB" in (wrapNode.attributes || {})) {
+      if ("distB" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distBottom = emuToPixels(wrapNode.attributes.distB);
       }
-      if ("wrapText" in (wrapNode.attributes || {})) {
+      if ("wrapText" in (wrapNode?.attributes || {})) {
         wrap2.attrs.wrapText = wrapNode.attributes.wrapText;
       }
-      const polygon = wrapNode.elements?.find((el) => el.name === "wp:wrapPolygon");
+      const polygon = wrapNode?.elements?.find((el) => el.name === "wp:wrapPolygon");
       if (polygon) {
         wrap2.attrs.polygon = polygonToObj(polygon);
         if (polygon.attributes?.edited !== void 0) {
@@ -28608,10 +28855,10 @@ function handleImageNode(node, params, isAnchor) {
       break;
     }
     case "TopAndBottom":
-      if ("distB" in (wrapNode.attributes || {})) {
+      if ("distB" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distBottom = emuToPixels(wrapNode.attributes.distB);
       }
-      if ("distT" in (wrapNode.attributes || {})) {
+      if ("distT" in (wrapNode?.attributes || {})) {
         wrap2.attrs.distTop = emuToPixels(wrapNode.attributes.distT);
       }
       break;
@@ -28629,17 +28876,42 @@ function handleImageNode(node, params, isAnchor) {
       alignV
     };
   }
-  const marginOffset = {
-    horizontal: positionHValue,
-    top: positionVValue
-  };
+  const graphic = node.elements.find((el) => el.name === "a:graphic");
+  const graphicData = graphic?.elements.find((el) => el.name === "a:graphicData");
+  const { uri: uri2 } = graphicData?.attributes || {};
+  const shapeURI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
+  if (!!uri2 && uri2 === shapeURI) {
+    const shapeMarginOffset = {
+      left: positionHValue,
+      horizontal: positionHValue,
+      top: positionVValue
+    };
+    return handleShapeDrawing(params, node, graphicData, size, padding, shapeMarginOffset);
+  }
+  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 spPr = picture.elements.find((el) => el.name === "pic:spPr");
+  if (spPr) {
+    const xfrm = spPr.elements.find((el) => el.name === "a:xfrm");
+    if (xfrm?.attributes) {
+      transformData = {
+        ...transformData,
+        rotation: rotToDegrees(xfrm.attributes["rot"]),
+        verticalFlip: xfrm.attributes["flipV"] === "1",
+        horizontalFlip: xfrm.attributes["flipH"] === "1"
+      };
+    }
+  }
   const { attributes: blipAttributes = {} } = blip;
   const rEmbed = blipAttributes["r:embed"];
   if (!rEmbed) return null;
   const currentFile = filename || "document.xml";
   let rels = docx[`word/_rels/${currentFile}.rels`];
   if (!rels) rels = docx[`word/_rels/document.xml.rels`];
-  const relationships = rels.elements.find((el) => el.name === "Relationships");
+  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;
@@ -28652,10 +28924,10 @@ function handleImageNode(node, params, isAnchor) {
     type: "image",
     attrs: {
       src: path,
-      alt: ["emf", "wmf"].includes(extension) ? "Unable to render EMF/WMF image" : docPr?.attributes.name || "Image",
+      alt: ["emf", "wmf"].includes(extension) ? "Unable to render EMF/WMF image" : docPr?.attributes?.name || "Image",
       extension,
-      id: docPr?.attributes.id || "",
-      title: docPr?.attributes.descr || "Image",
+      id: docPr?.attributes?.id || "",
+      title: docPr?.attributes?.descr || "Image",
       inline: true,
       padding,
       marginOffset,
@@ -28670,6 +28942,10 @@ function handleImageNode(node, params, isAnchor) {
         }
       },
       wrap: wrap2,
+      ...wrap2.type === "Square" && wrap2.attrs.wrapText ? {
+        wrapText: wrap2.attrs.wrapText
+      } : {},
+      wrapTopAndBottom: wrap2.type === "TopAndBottom",
       originalPadding: {
         distT: attributes["distT"],
         distB: attributes["distB"],
@@ -28681,7 +28957,7 @@ function handleImageNode(node, params, isAnchor) {
     }
   };
 }
-const handleShapeDrawing = (params, node, graphicData) => {
+const handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset) => {
   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");
@@ -28692,21 +28968,14 @@ const handleShapeDrawing = (params, node, graphicData) => {
     return getRectangleShape(params, spPr);
   }
   if (!textBoxContent) {
-    return null;
+    return buildShapePlaceholder(node, size, padding, marginOffset, "drawing");
   }
-  const { nodeListHandler } = params;
-  const translatedElement = nodeListHandler.handler({
-    ...params,
-    node: textBoxContent.elements[0],
-    nodes: textBoxContent.elements,
-    path: [...params.path || [], textBoxContent]
-  });
-  return translatedElement[0];
+  return buildShapePlaceholder(node, size, padding, marginOffset, "textbox");
 };
 const getRectangleShape = (params, node) => {
   const schemaAttrs = {};
   const [drawingNode] = params.nodes;
-  if (drawingNode?.name === "w:drawing") {
+  if (drawingNode?.name === DRAWING_XML_TAG) {
     schemaAttrs.drawingContent = drawingNode;
   }
   const xfrm = node.elements.find((el) => el.name === "a:xfrm");
@@ -28730,6 +28999,52 @@ const getRectangleShape = (params, node) => {
     attrs: schemaAttrs
   };
 };
+const buildShapePlaceholder = (node, size, padding, marginOffset, shapeType) => {
+  const attrs = {
+    drawingContent: {
+      name: DRAWING_XML_TAG,
+      elements: [carbonCopy(node)]
+    },
+    attributes: {
+      "data-shape-type": shapeType
+    }
+  };
+  if (size && (Number.isFinite(size.width) || Number.isFinite(size.height))) {
+    attrs.size = {
+      ...Number.isFinite(size.width) ? { width: size.width } : {},
+      ...Number.isFinite(size.height) ? { height: size.height } : {}
+    };
+  }
+  if (padding) {
+    const paddingData = {};
+    if (Number.isFinite(padding.top)) paddingData["data-padding-top"] = padding.top;
+    if (Number.isFinite(padding.right)) paddingData["data-padding-right"] = padding.right;
+    if (Number.isFinite(padding.bottom)) paddingData["data-padding-bottom"] = padding.bottom;
+    if (Number.isFinite(padding.left)) paddingData["data-padding-left"] = padding.left;
+    if (Object.keys(paddingData).length) {
+      attrs.attributes = {
+        ...attrs.attributes,
+        ...paddingData
+      };
+    }
+  }
+  if (marginOffset) {
+    const offsetData = {};
+    const horizontal = Number.isFinite(marginOffset.horizontal) ? marginOffset.horizontal : Number.isFinite(marginOffset.left) ? marginOffset.left : void 0;
+    if (Number.isFinite(horizontal)) offsetData["data-offset-x"] = horizontal;
+    if (Number.isFinite(marginOffset.top)) offsetData["data-offset-y"] = marginOffset.top;
+    if (Object.keys(offsetData).length) {
+      attrs.attributes = {
+        ...attrs.attributes,
+        ...offsetData
+      };
+    }
+  }
+  return {
+    type: "contentBlock",
+    attrs
+  };
+};
 function handleAnchorNode(params) {
   const { node } = params.extraParams;
   if (node.name !== "wp:anchor") {
@@ -35441,7 +35756,7 @@ export {
   objectIncludes as Z,
   AddMarkStep as _,
   Plugin as a,
-  translator$10 as a$,
+  translator$b as a$,
   twipsToLines as a0,
   pixelsToTwips as a1,
   helpers as a2,
@@ -35452,33 +35767,33 @@ export {
   createDocFromMarkdown as a7,
   createDocFromHTML as a8,
   EditorState as a9,
-  xmljs as aA,
-  vClickOutside as aB,
-  getActiveFormatting as aC,
-  readFromClipboard as aD,
-  handleClipboardPaste as aE,
-  getFileObject as aF,
-  runPropertyTranslators as aG,
-  translator$d as aH,
-  translator$k as aI,
-  translator$m as aJ,
-  translator$e as aK,
-  translator$f as aL,
-  translator$n as aM,
-  translator$o as aN,
-  translator$j as aO,
-  translator$g as aP,
-  translator$r as aQ,
-  translator$i as aR,
-  translator$l as aS,
-  translator$h as aT,
-  translator$q as aU,
-  translator$p as aV,
-  commentRangeEndTranslator as aW,
-  commentRangeStartTranslator as aX,
-  translator$a as aY,
-  translator$b as aZ,
-  translator$$ as a_,
+  getDefaultExportFromCjs$2 as aA,
+  getContentTypesFromXml as aB,
+  xmljs as aC,
+  vClickOutside as aD,
+  getActiveFormatting as aE,
+  readFromClipboard as aF,
+  handleClipboardPaste as aG,
+  getFileObject as aH,
+  runPropertyTranslators as aI,
+  translator$d as aJ,
+  translator$k as aK,
+  translator$m as aL,
+  translator$e as aM,
+  translator$f as aN,
+  translator$n as aO,
+  translator$o as aP,
+  translator$j as aQ,
+  translator$g as aR,
+  translator$r as aS,
+  translator$i as aT,
+  translator$l as aU,
+  translator$h as aV,
+  translator$q as aW,
+  translator$p as aX,
+  commentRangeEndTranslator as aY,
+  commentRangeStartTranslator as aZ,
+  translator$a as a_,
   hasSomeParentWithClass as aa,
   isActive as ab,
   unflattenListsInHtml as ac,
@@ -35496,81 +35811,83 @@ export {
   docxNumberigHelpers as ao,
   parseIndentElement as ap,
   combineIndents as aq,
-  SelectionRange as ar,
-  Transform as as,
-  isInTable as at,
-  generateDocxRandomId as au,
-  insertNewRelationship as av,
-  inchesToPixels as aw,
-  commonjsGlobal as ax,
-  getDefaultExportFromCjs$2 as ay,
-  getContentTypesFromXml as az,
+  twipsToPixels as ar,
+  PIXELS_PER_INCH as as,
+  SelectionRange as at,
+  Transform as au,
+  isInTable as av,
+  generateDocxRandomId as aw,
+  insertNewRelationship as ax,
+  inchesToPixels as ay,
+  commonjsGlobal as az,
   Slice as b,
-  _sfc_main as b$,
-  translator$1l as b0,
-  translator$_ as b1,
-  translator$11 as b2,
-  translator$Z as b3,
-  translator$z as b4,
-  translator$c as b5,
-  translator$M as b6,
-  translator$N as b7,
-  translator$O as b8,
-  translator$P as b9,
-  translator$1o as bA,
-  translator$F as bB,
-  translator$14 as bC,
-  translator$G as bD,
-  translator$H as bE,
-  translator$1m as bF,
-  translator$1c as bG,
-  translator$1q as bH,
-  translator$15 as bI,
-  translator$u as bJ,
-  translator$16 as bK,
-  translator$17 as bL,
-  translator$J as bM,
-  translator$9 as bN,
-  translator$18 as bO,
-  translator$1j as bP,
-  translator$19 as bQ,
-  translator$1a as bR,
-  translator$1r as bS,
-  translator$L as bT,
-  translator$7 as bU,
-  translator$6 as bV,
-  translator$Y as bW,
-  translator$1n as bX,
-  translator$4 as bY,
-  translator$5 as bZ,
-  translator$1 as b_,
-  translator$Q as ba,
-  translator$v as bb,
-  translator$R as bc,
-  translator$S as bd,
-  translator$T as be,
-  translator$U as bf,
-  translator$12 as bg,
-  translator$t as bh,
-  translator$V as bi,
-  translator$13 as bj,
-  translator$w as bk,
-  translator$W as bl,
-  translator$x as bm,
-  translator$s as bn,
-  translator$1p as bo,
-  translator$1f as bp,
-  translator$1g as bq,
-  translator$1k as br,
-  translator$B as bs,
-  translator$X as bt,
-  translator$8 as bu,
-  translator$D as bv,
-  translator$1h as bw,
-  translator$1d as bx,
-  translator$1i as by,
-  translator$1b as bz,
+  translator$5 as b$,
+  translator$$ as b0,
+  translator$10 as b1,
+  translator$1l as b2,
+  translator$_ as b3,
+  translator$11 as b4,
+  translator$Z as b5,
+  translator$z as b6,
+  translator$c as b7,
+  translator$M as b8,
+  translator$N as b9,
+  translator$1i as bA,
+  translator$1b as bB,
+  translator$1o as bC,
+  translator$F as bD,
+  translator$14 as bE,
+  translator$G as bF,
+  translator$H as bG,
+  translator$1m as bH,
+  translator$1c as bI,
+  translator$1q as bJ,
+  translator$15 as bK,
+  translator$u as bL,
+  translator$16 as bM,
+  translator$17 as bN,
+  translator$J as bO,
+  translator$9 as bP,
+  translator$18 as bQ,
+  translator$1j as bR,
+  translator$19 as bS,
+  translator$1a as bT,
+  translator$1r as bU,
+  translator$L as bV,
+  translator$7 as bW,
+  translator$6 as bX,
+  translator$Y as bY,
+  translator$1n as bZ,
+  translator$4 as b_,
+  translator$O as ba,
+  translator$P as bb,
+  translator$Q as bc,
+  translator$v as bd,
+  translator$R as be,
+  translator$S as bf,
+  translator$T as bg,
+  translator$U as bh,
+  translator$12 as bi,
+  translator$t as bj,
+  translator$V as bk,
+  translator$13 as bl,
+  translator$w as bm,
+  translator$W as bn,
+  translator$x as bo,
+  translator$s as bp,
+  translator$1p as bq,
+  translator$1f as br,
+  translator$1g as bs,
+  translator$1k as bt,
+  translator$B as bu,
+  translator$X as bv,
+  translator$8 as bw,
+  translator$D as bx,
+  translator$1h as by,
+  translator$1d as bz,
   DOMParser$1 as c,
+  translator$1 as c0,
+  _sfc_main as c1,
   Mark as d,
   dropPoint as e,
   callOrGet as f,