@beyondwork/docx-react-component 1.0.28 → 1.0.30

package/src/io/ooxml/parse-headers-footers.ts

@@ -14,6 +14,22 @@ import type {
 } from "../../model/canonical-document.ts";
 import { resolveHighlightColor } from "./highlight-colors.ts";
 import { classifyFieldInstruction } from "./parse-fields.ts";
+import {
+  readCellBorders,
+  readCellShading,
+  readCellVerticalAlign,
+  readCellWidth,
+  readGridColumns as readSharedGridColumns,
+  readRowHeight,
+  readRowHeightRule,
+  readRowIsHeader,
+  readTableAlignment,
+  readTableBorders,
+  readTableCellMargins,
+  readTableLook,
+  readTableStyleId,
+  readTableWidth,
+} from "./parse-tables.ts";
 import { parseShapeXml, parseVmlXml } from "./parse-shapes.ts";
 
 // ---- Public types ----
@@ -906,6 +922,11 @@ function parseSimpleTableElement(tblElement: XmlElementNode): TableNode {
   const rows: TableRowNode[] = [];
   let propertiesXml: string | undefined;
   let styleId: string | undefined;
+  let width: TableNode["width"];
+  let alignment: TableNode["alignment"];
+  let borders: TableNode["borders"];
+  let cellMargins: TableNode["cellMargins"];
+  let tblLook: TableNode["tblLook"];
 
   for (const child of tblElement.children) {
     if (child.type !== "element") continue;
@@ -913,8 +934,12 @@ function parseSimpleTableElement(tblElement: XmlElementNode): TableNode {
 
     if (name === "tblPr") {
       propertiesXml = serializeElementToXml(child);
-      const pStyle = findChildElementOptional(child, "tblStyle");
-      styleId = pStyle?.attributes["w:val"] ?? pStyle?.attributes.val;
+      styleId = readTableStyleId(child);
+      width = readTableWidth(child);
+      alignment = readTableAlignment(child);
+      borders = readTableBorders(child);
+      cellMargins = readTableCellMargins(child);
+      tblLook = readTableLook(child);
     } else if (name === "tblGrid") {
       gridColumns = readGridColumns(child);
     } else if (name === "tr") {
@@ -928,24 +953,24 @@ function parseSimpleTableElement(tblElement: XmlElementNode): TableNode {
     ...(propertiesXml ? { propertiesXml } : {}),
     gridColumns,
     rows,
+    ...(width ? { width } : {}),
+    ...(alignment ? { alignment } : {}),
+    ...(borders ? { borders } : {}),
+    ...(cellMargins ? { cellMargins } : {}),
+    ...(tblLook ? { tblLook } : {}),
   };
 }
 
 function readGridColumns(tblGrid: XmlElementNode): number[] {
-  const columns: number[] = [];
-  for (const child of tblGrid.children) {
-    if (child.type !== "element") continue;
-    if (localName(child.name) === "gridCol") {
-      const w = child.attributes["w:w"] ?? child.attributes.w ?? "0";
-      columns.push(Number.parseInt(w, 10) || 0);
-    }
-  }
-  return columns;
+  return readSharedGridColumns(tblGrid);
 }
 
 function parseSimpleTableRow(trElement: XmlElementNode): TableRowNode {
   const cells: TableCellNode[] = [];
   let propertiesXml: string | undefined;
+  let height: TableRowNode["height"];
+  let heightRule: TableRowNode["heightRule"];
+  let isHeader: TableRowNode["isHeader"];
 
   for (const child of trElement.children) {
     if (child.type !== "element") continue;
@@ -953,6 +978,9 @@ function parseSimpleTableRow(trElement: XmlElementNode): TableRowNode {
 
     if (name === "trPr") {
       propertiesXml = serializeElementToXml(child);
+      height = readRowHeight(child);
+      heightRule = readRowHeightRule(child);
+      isHeader = readRowIsHeader(child);
     } else if (name === "tc") {
       cells.push(parseSimpleTableCell(child));
     }
@@ -961,6 +989,9 @@ function parseSimpleTableRow(trElement: XmlElementNode): TableRowNode {
   return {
     type: "table_row",
     ...(propertiesXml ? { propertiesXml } : {}),
+    ...(height !== undefined ? { height } : {}),
+    ...(heightRule ? { heightRule } : {}),
+    ...(isHeader !== undefined ? { isHeader } : {}),
     cells,
   };
 }
@@ -970,6 +1001,10 @@ function parseSimpleTableCell(tcElement: XmlElementNode): TableCellNode {
   let propertiesXml: string | undefined;
   let gridSpan: number | undefined;
   let verticalMerge: "restart" | "continue" | undefined;
+  let width: TableCellNode["width"];
+  let borders: TableCellNode["borders"];
+  let shading: TableCellNode["shading"];
+  let verticalAlign: TableCellNode["verticalAlign"];
 
   for (const child of tcElement.children) {
     if (child.type !== "element") continue;
@@ -986,6 +1021,10 @@ function parseSimpleTableCell(tcElement: XmlElementNode): TableCellNode {
         const vmVal = vmEl.attributes["w:val"] ?? vmEl.attributes.val ?? "continue";
         verticalMerge = vmVal === "restart" ? "restart" : "continue";
       }
+      width = readCellWidth(child);
+      borders = readCellBorders(child);
+      shading = readCellShading(child);
+      verticalAlign = readCellVerticalAlign(child);
     } else if (name === "p") {
       children.push(parseParagraphElement(child));
     }
@@ -996,6 +1035,10 @@ function parseSimpleTableCell(tcElement: XmlElementNode): TableCellNode {
     ...(propertiesXml ? { propertiesXml } : {}),
     ...(gridSpan ? { gridSpan } : {}),
     ...(verticalMerge ? { verticalMerge } : {}),
+    ...(width ? { width } : {}),
+    ...(borders ? { borders } : {}),
+    ...(shading ? { shading } : {}),
+    ...(verticalAlign ? { verticalAlign } : {}),
     children: children.length > 0 ? children : [{ type: "paragraph", children: [] }],
   };
 }

package/src/io/ooxml/parse-main-document.ts

@@ -1,11 +1,15 @@
 import type {
   BorderSpec,
+  CellShading,
   TextMark,
   ParagraphBorders,
   ParagraphShading,
   ParagraphSpacing,
   ParagraphIndentation,
   TabStop,
+  TableBorders,
+  TableCellBorders,
+  TableCellMargins,
   TableLook,
   TableWidth,
   SectionProperties,
@@ -29,6 +33,22 @@ import { parseComplexContentXml } from "./parse-complex-content.ts";
 import { parseShapeXml, parseVmlXml } from "./parse-shapes.ts";
 import { classifyFieldInstruction } from "./parse-fields.ts";
 import { resolveHighlightColor } from "./highlight-colors.ts";
+import {
+  readCellBorders as readSharedCellBorders,
+  readCellShading as readSharedCellShading,
+  readCellVerticalAlign as readSharedCellVerticalAlign,
+  readCellWidth as readSharedCellWidth,
+  readGridColumns as readSharedGridColumns,
+  readRowHeight as readSharedRowHeight,
+  readRowHeightRule as readSharedRowHeightRule,
+  readRowIsHeader as readSharedRowIsHeader,
+  readTableAlignment as readSharedTableAlignment,
+  readTableBorders as readSharedTableBorders,
+  readTableCellMargins as readSharedTableCellMargins,
+  readTableLook as readSharedTableLook,
+  readTableStyleId as readSharedTableStyleId,
+  readTableWidth as readSharedTableWidth,
+} from "./parse-tables.ts";
 
 export interface ParsedMainDocument {
   blocks: ParsedBlockNode[];
@@ -303,6 +323,10 @@ export interface ParsedTableBlockNode {
   propertiesXml?: string;
   gridColumns: number[];
   rows: ParsedTableRowNode[];
+  width?: TableWidth;
+  alignment?: "left" | "center" | "right";
+  borders?: TableBorders;
+  cellMargins?: TableCellMargins;
   rawXml: string;
 }
 
@@ -314,6 +338,9 @@ export interface ParsedTableRowNode {
   widthBefore?: TableWidth;
   gridAfter?: number;
   widthAfter?: TableWidth;
+  height?: number;
+  heightRule?: "auto" | "atLeast" | "exact";
+  isHeader?: boolean;
   rawXml: string;
 }
 
@@ -323,6 +350,10 @@ export interface ParsedTableCellNode {
   gridSpan?: number;
   verticalMerge?: "restart" | "continue";
   children: ParsedBlockNode[];
+  width?: TableWidth;
+  borders?: TableCellBorders;
+  shading?: CellShading;
+  verticalAlign?: "top" | "center" | "bottom";
   rawXml: string;
 }
 
@@ -805,6 +836,10 @@ function parseTableElement(
   let tblLook: TableLook | undefined;
   let propertiesXml: string | undefined;
   let gridColumns: number[] = [];
+  let width: TableWidth | undefined;
+  let alignment: ParsedTableBlockNode["alignment"];
+  let borders: TableBorders | undefined;
+  let cellMargins: TableCellMargins | undefined;
   const rows: ParsedTableRowNode[] = [];
 
   for (const child of node.children) {
@@ -815,6 +850,10 @@ function parseTableElement(
         propertiesXml = sourceXml.slice(child.start, child.end);
         styleId = readTableStyleId(child);
         tblLook = readTableLook(child);
+        width = readTableWidth(child);
+        alignment = readTableAlignment(child);
+        borders = readTableBorders(child);
+        cellMargins = readTableCellMargins(child);
         break;
       }
       case "tblGrid": {
@@ -835,6 +874,10 @@ function parseTableElement(
     ...(propertiesXml ? { propertiesXml } : {}),
     gridColumns,
     rows,
+    ...(width ? { width } : {}),
+    ...(alignment ? { alignment } : {}),
+    ...(borders ? { borders } : {}),
+    ...(cellMargins ? { cellMargins } : {}),
     rawXml: sourceXml.slice(node.start, node.end),
   };
 }
@@ -852,6 +895,9 @@ function parseTableRowElement(
   let widthBefore: TableWidth | undefined;
   let gridAfter: number | undefined;
   let widthAfter: TableWidth | undefined;
+  let height: number | undefined;
+  let heightRule: ParsedTableRowNode["heightRule"];
+  let isHeader: boolean | undefined;
   const cells: ParsedTableCellNode[] = [];
 
   for (const child of node.children) {
@@ -864,6 +910,9 @@ function parseTableRowElement(
         widthBefore = readTableRowWidth(child, "wBefore");
         gridAfter = readTableRowGridPosition(child, "gridAfter");
         widthAfter = readTableRowWidth(child, "wAfter");
+        height = readRowHeight(child);
+        heightRule = readRowHeightRule(child);
+        isHeader = readRowIsHeader(child);
         break;
       case "tc":
         cells.push(parseTableCellElement(child, sourceXml, relationshipMap, relationships, mediaParts, sourcePartPath));
@@ -878,6 +927,9 @@ function parseTableRowElement(
     ...(widthBefore ? { widthBefore } : {}),
     ...(gridAfter !== undefined ? { gridAfter } : {}),
     ...(widthAfter ? { widthAfter } : {}),
+    ...(height !== undefined ? { height } : {}),
+    ...(heightRule ? { heightRule } : {}),
+    ...(isHeader !== undefined ? { isHeader } : {}),
     cells,
     rawXml: sourceXml.slice(node.start, node.end),
   };
@@ -894,6 +946,10 @@ function parseTableCellElement(
   let propertiesXml: string | undefined;
   let gridSpan: number | undefined;
   let verticalMerge: "restart" | "continue" | undefined;
+  let width: TableWidth | undefined;
+  let borders: TableCellBorders | undefined;
+  let shading: CellShading | undefined;
+  let verticalAlign: ParsedTableCellNode["verticalAlign"];
   const children: ParsedBlockNode[] = [];
 
   for (const child of node.children) {
@@ -904,6 +960,10 @@ function parseTableCellElement(
         propertiesXml = sourceXml.slice(child.start, child.end);
         gridSpan = readCellGridSpan(child);
         verticalMerge = readCellVerticalMerge(child);
+        width = readCellWidth(child);
+        borders = readCellBorders(child);
+        shading = readCellShading(child);
+        verticalAlign = readCellVerticalAlign(child);
         break;
       }
       default: {
@@ -920,6 +980,10 @@ function parseTableCellElement(
     ...(gridSpan ? { gridSpan } : {}),
     ...(verticalMerge ? { verticalMerge } : {}),
     children,
+    ...(width ? { width } : {}),
+    ...(borders ? { borders } : {}),
+    ...(shading ? { shading } : {}),
+    ...(verticalAlign ? { verticalAlign } : {}),
     rawXml: sourceXml.slice(node.start, node.end),
   };
 }
@@ -1138,53 +1202,59 @@ function findFirstDescendant(node: XmlElementNode, local: string): XmlElementNod
 }
 
 function readTableStyleId(node: XmlElementNode): string | undefined {
-  for (const child of node.children) {
-    if (child.type !== "element" || localName(child.name) !== "tblStyle") continue;
-    const styleId = child.attributes["w:val"] ?? child.attributes.val;
-    if (styleId) return styleId;
-  }
-  return undefined;
+  return readSharedTableStyleId(node);
 }
 
 function readTableLook(node: XmlElementNode): TableLook | undefined {
-  const tblLookNode = node.children.find(
-    (child): child is XmlElementNode => child.type === "element" && localName(child.name) === "tblLook",
-  );
-  if (!tblLookNode) {
-    return undefined;
-  }
+  return readSharedTableLook(node);
+}
 
-  const tableLook: TableLook = {};
-  const val = tblLookNode.attributes["w:val"] ?? tblLookNode.attributes.val;
-  if (val) {
-    tableLook.val = val;
-  }
-  for (const [attribute, key] of [
-    ["w:firstRow", "firstRow"],
-    ["w:lastRow", "lastRow"],
-    ["w:firstColumn", "firstColumn"],
-    ["w:lastColumn", "lastColumn"],
-    ["w:noHBand", "noHBand"],
-    ["w:noVBand", "noVBand"],
-  ] as const) {
-    const fallback = attribute.replace("w:", "");
-    const raw = tblLookNode.attributes[attribute] ?? tblLookNode.attributes[fallback];
-    if (raw !== undefined) {
-      tableLook[key] = raw !== "0" && raw !== "false" && raw !== "off";
-    }
-  }
+function readTableGridColumns(node: XmlElementNode): number[] {
+  return readSharedGridColumns(node);
+}
 
-  return Object.keys(tableLook).length > 0 ? tableLook : undefined;
+function readTableWidth(node: XmlElementNode): TableWidth | undefined {
+  return readSharedTableWidth(node);
 }
 
-function readTableGridColumns(node: XmlElementNode): number[] {
-  return node.children
-    .filter((child): child is XmlElementNode => child.type === "element" && localName(child.name) === "gridCol")
-    .map((child) => {
-      const raw = child.attributes["w:w"] ?? child.attributes.w ?? "0";
-      const value = Number.parseInt(raw, 10);
-      return Number.isFinite(value) && value > 0 ? value : 0;
-    });
+function readTableAlignment(node: XmlElementNode): ParsedTableBlockNode["alignment"] {
+  return readSharedTableAlignment(node);
+}
+
+function readTableBorders(node: XmlElementNode): TableBorders | undefined {
+  return readSharedTableBorders(node);
+}
+
+function readTableCellMargins(node: XmlElementNode): TableCellMargins | undefined {
+  return readSharedTableCellMargins(node);
+}
+
+function readRowHeight(node: XmlElementNode): number | undefined {
+  return readSharedRowHeight(node);
+}
+
+function readRowHeightRule(node: XmlElementNode): ParsedTableRowNode["heightRule"] {
+  return readSharedRowHeightRule(node);
+}
+
+function readRowIsHeader(node: XmlElementNode): boolean | undefined {
+  return readSharedRowIsHeader(node);
+}
+
+function readCellWidth(node: XmlElementNode): TableWidth | undefined {
+  return readSharedCellWidth(node);
+}
+
+function readCellBorders(node: XmlElementNode): TableCellBorders | undefined {
+  return readSharedCellBorders(node);
+}
+
+function readCellShading(node: XmlElementNode): CellShading | undefined {
+  return readSharedCellShading(node);
+}
+
+function readCellVerticalAlign(node: XmlElementNode): ParsedTableCellNode["verticalAlign"] {
+  return readSharedCellVerticalAlign(node);
 }
 
 /**
@@ -1827,7 +1897,7 @@ function parseRevisionContainer(
   relationshipMap: Map<string, OpcRelationship>,
 ): ParsedInlineNode[] {
   const result: ParsedInlineNode[] = [];
-  const allowsDeletedText = localName(node.name) === "del";
+  const allowsDeletedText = false;
 
   for (const child of node.children) {
     if (child.type !== "element") {
@@ -2006,7 +2076,7 @@ function parseRunContentOnly(
       case "delText":
       case "delInstrText":
         if (!options.allowDeletedText) {
-          return { nodes: [], supported: false };
+          break;
         }
         nodes.push({
           type: "text",