@meistrari/minuta-editor 1.0.1 → 1.0.2

package/dist/chunks/docxExport.mjs

@@ -70,6 +70,8 @@ function parseStyle(style) {
   if (bg && bg.toLowerCase() !== "ffffff")
     info.highlight = bg;
   info.size = cssSizeToHalfPoints(getProp(style, "font-size"));
+  if (getProp(style, "text-transform") === "uppercase")
+    info.caps = true;
   const family = getProp(style, "font-family");
   if (family)
     info.font = family.split(",")[0].trim().replace(/["']/g, "");
@@ -123,6 +125,7 @@ function measureEl(el) {
     color: cssColorToHex(cs.color),
     bold: (Number.parseInt(cs.fontWeight) || 400) >= 600,
     italics: cs.fontStyle.includes("italic"),
+    caps: cs.textTransform === "uppercase",
     align: cssAlignToDocx(cs.textAlign)
   };
 }
@@ -145,6 +148,7 @@ function runOptions(info) {
     italics: info.italics,
     underline: info.underline ? {} : void 0,
     strike: info.strike,
+    allCaps: info.caps || void 0,
     color: info.color,
     size: info.size,
     font: info.font,
@@ -165,6 +169,22 @@ function primaryFont(cs) {
   const family = cs.fontFamily?.split(",")[0]?.trim().replace(/["']/g, "");
   return family || void 0;
 }
+function withMarks(base, marks) {
+  const info = { ...base };
+  for (const mark of marks) {
+    if (mark.type.name === "bold")
+      info.bold = true;
+    if (mark.type.name === "italic")
+      info.italics = true;
+    if (mark.type.name === "underline")
+      info.underline = true;
+    if (mark.type.name === "strike")
+      info.strike = true;
+    if (mark.type.name === "inlineStyle")
+      Object.assign(info, cleanUndefined(parseStyle(mark.attrs.style)));
+  }
+  return info;
+}
 function inlineToRuns(node, base, ctx) {
   const runs = [];
   node.forEach((child) => {
@@ -186,7 +206,7 @@ function inlineToRuns(node, base, ctx) {
     }
     if (child.type.name === "variableChip") {
       if (child.attrs.text)
-        runs.push(new TextRun({ text: child.attrs.text, ...runOptions(base) }));
+        runs.push(new TextRun({ text: child.attrs.text, ...runOptions(withMarks(base, child.marks)) }));
       return;
     }
     if (child.type.name === "hardBreak") {
@@ -245,6 +265,7 @@ function domInlineToRuns(root, fallback = {}) {
       italics: cs.fontStyle.includes("italic") || void 0,
       underline: cs.textDecorationLine?.includes("underline") ? {} : void 0,
       strike: cs.textDecorationLine?.includes("line-through") || void 0,
+      allCaps: cs.textTransform === "uppercase" || void 0,
       characterSpacing: TRACKING_COMPENSATION_TW
     }));
   }
@@ -296,7 +317,7 @@ function spacingFrom(m, style) {
 function textBlockToParagraph(node, pos, ctx, opts = {}) {
   const m = measureAt(ctx, pos);
   const style = node.attrs.style;
-  const base = m ? { bold: m.bold, italics: m.italics, color: m.color, size: m.sizeHalf, font: primaryFont(m.cs) } : parseStyle(style);
+  const base = m ? { bold: m.bold, italics: m.italics, caps: m.caps, color: m.color, size: m.sizeHalf, font: primaryFont(m.cs) } : parseStyle(style);
   if (ctx.extraTrackingTw)
     base.trackingTw = ctx.extraTrackingTw;
   const ownIndent = m ? m.marginLeftTw + Math.round((Number.parseFloat(m.cs.paddingLeft) || 0) * PX_TO_TWIP) : cssLengthToTwips(getProp(style, "margin-left")) ?? 0;
@@ -652,6 +673,66 @@ function isFlexRow(node) {
     return false;
   return node.childCount > 1;
 }
+function islandImage(node) {
+  if (node.type.name !== "htmlIsland")
+    return null;
+  const tpl = document.createElement("template");
+  tpl.innerHTML = node.attrs.html || "";
+  const el = tpl.content.firstElementChild;
+  if (!el)
+    return null;
+  const img = el.tagName === "IMG" ? el : el.querySelector("img");
+  return img instanceof HTMLImageElement ? img : null;
+}
+function collectImageIslands(node, pos) {
+  if (islandImage(node))
+    return [{ node, pos }];
+  if (node.type.name !== "styledDiv")
+    return null;
+  const out = [];
+  let childPos = pos + 1;
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (!(child.isTextblock && child.content.size === 0)) {
+      const inner = collectImageIslands(child, childPos);
+      if (!inner)
+        return null;
+      out.push(...inner);
+    }
+    childPos += child.nodeSize;
+  }
+  return out.length ? out : null;
+}
+async function inlineImagesParagraph(islands, innerPx, ctx) {
+  const GAP_PX = 8;
+  const items = [];
+  for (const { node, pos } of islands) {
+    const img = islandImage(node);
+    const src = await srcToDataUrl(img.getAttribute("src") || "");
+    if (!src)
+      continue;
+    const live = domAt(ctx, pos)?.querySelector("img");
+    const styleW = Number.parseFloat(getProp(img.getAttribute("style"), "width") ?? "");
+    const widthPx = live?.offsetWidth || 0 || (Number.isFinite(styleW) && styleW > 0 ? styleW : 0) || Math.min(innerPx, 200);
+    items.push({ src, widthPx });
+  }
+  if (!items.length)
+    return null;
+  const total = items.reduce((a, b) => a + b.widthPx, 0) + GAP_PX * (items.length - 1);
+  const scale = innerPx > 0 && total > innerPx ? (innerPx - GAP_PX * (items.length - 1)) / (total - GAP_PX * (items.length - 1)) : 1;
+  const runs = [];
+  for (let i = 0; i < items.length; i++) {
+    const run = await dataUrlToImageRun(items[i].src, Math.max(1, Math.round(items[i].widthPx * scale)));
+    if (!run)
+      continue;
+    if (runs.length)
+      runs.push(new TextRun({ text: "  " }));
+    runs.push(run);
+  }
+  if (!runs.length)
+    return null;
+  return new Paragraph({ children: runs, alignment: AlignmentType.CENTER, spacing: { after: 0, before: 0 } });
+}
 async function tableToDocx(node, pos, contentWidthPx, ctx) {
   const tableDomRaw = domAt(ctx, pos);
   const tableEl = tableDomRaw?.tagName === "TABLE" ? tableDomRaw : tableDomRaw?.querySelector("table") ?? null;
@@ -681,9 +762,36 @@ async function tableToDocx(node, pos, contentWidthPx, ctx) {
         }
       }
       const cellCtx = { ...ctx, insideCell: true, indentLeft: 0, lastAfterTw: 0, pending: { breakBefore: false }, extraTrackingTw: extraTrackingTw || void 0 };
+      const cellInnerPx = cellM?.el ? cellM.el.clientWidth - (Number.parseFloat(cellM.cs.paddingLeft) || 0) - (Number.parseFloat(cellM.cs.paddingRight) || 0) : contentWidthPx / 2;
+      const isEmptyBlock = (n) => n.isTextblock && n.content.size === 0;
+      const besideImage = (k) => k > 0 && !!collectImageIslands(cellNode.child(k - 1), 0) || k + 1 < cellNode.childCount && !!collectImageIslands(cellNode.child(k + 1), 0);
       let childPos = cellPos + 1;
       for (let k = 0; k < cellNode.childCount; k++) {
         const child = cellNode.child(k);
+        if (isEmptyBlock(child) && besideImage(k)) {
+          childPos += child.nodeSize;
+          continue;
+        }
+        const islands = collectImageIslands(child, childPos);
+        if (islands?.length) {
+          let end = k + 1;
+          let endPos = childPos + child.nodeSize;
+          while (end < cellNode.childCount) {
+            const next = cellNode.child(end);
+            const more = collectImageIslands(next, endPos);
+            if (!more?.length)
+              break;
+            islands.push(...more);
+            endPos += next.nodeSize;
+            end++;
+          }
+          const para = await inlineImagesParagraph(islands, cellInnerPx, cellCtx);
+          if (para)
+            cellContent.push(para);
+          childPos = endPos;
+          k = end - 1;
+          continue;
+        }
         if (child.isTextblock)
           cellContent.push(textBlockToParagraph(child, childPos, cellCtx));
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meistrari/minuta-editor",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Editor de minuta do defesa.ai sem framework: folha A4 paginada, edição rica, placeholders de variável e export DOCX fiel ao preview — monta em qualquer app (React, Vue, vanilla)",
   "repository": {
     "type": "git",