oasis-editor 0.0.88 → 0.0.89

package/dist/{index-Ds5uOUe8.js → index-BICQTKCZ.js}

@@ -1650,6 +1650,24 @@ const en = {
   "table.wrapAround": "Around",
   "table.positioning": "Positioning...",
   "table.positioningReadOnly": "Floating table positioning is preserved for DOCX round-trip and is not editable yet.",
+  "table.horizontalAnchor": "Horizontal relative to",
+  "table.verticalAnchor": "Vertical relative to",
+  "table.anchorMargin": "Margin",
+  "table.anchorPage": "Page",
+  "table.anchorText": "Text",
+  "table.positionX": "Horizontal position (pt)",
+  "table.positionY": "Vertical position (pt)",
+  "table.horizontalAlignment": "Horizontal alignment",
+  "table.explicitOffset": "Explicit offset",
+  "table.distanceTop": "Top distance (pt)",
+  "table.distanceRight": "Right distance (pt)",
+  "table.distanceBottom": "Bottom distance (pt)",
+  "table.distanceLeft": "Left distance (pt)",
+  "table.allowOverlap": "Allow overlap",
+  "table.borderStart": "Start",
+  "table.borderEnd": "End",
+  "table.borderTlBr": "Diagonal down",
+  "table.borderTrBl": "Diagonal up",
   "table.rowHeight": "Preferred height",
   "table.rowHeightRule": "Row height is",
   "table.rowAuto": "Auto",
@@ -2108,6 +2126,24 @@ const ptBR = {
   "table.wrapAround": "Ao redor",
   "table.positioning": "Posicionamento...",
   "table.positioningReadOnly": "O posicionamento de tabela flutuante é preservado no DOCX e ainda não é editável.",
+  "table.horizontalAnchor": "Horizontal relativo a",
+  "table.verticalAnchor": "Vertical relativo a",
+  "table.anchorMargin": "Margem",
+  "table.anchorPage": "Página",
+  "table.anchorText": "Texto",
+  "table.positionX": "Posição horizontal (pt)",
+  "table.positionY": "Posição vertical (pt)",
+  "table.horizontalAlignment": "Alinhamento horizontal",
+  "table.explicitOffset": "Deslocamento explícito",
+  "table.distanceTop": "Distância superior (pt)",
+  "table.distanceRight": "Distância direita (pt)",
+  "table.distanceBottom": "Distância inferior (pt)",
+  "table.distanceLeft": "Distância esquerda (pt)",
+  "table.allowOverlap": "Permitir sobreposição",
+  "table.borderStart": "Início",
+  "table.borderEnd": "Fim",
+  "table.borderTlBr": "Diagonal descendente",
+  "table.borderTrBl": "Diagonal ascendente",
   "table.rowHeight": "Altura preferencial",
   "table.rowHeightRule": "Altura da linha",
   "table.rowAuto": "Automática",
@@ -2483,7 +2519,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-Bx4I4GCm.js").then((m) => {
+    import("./OasisEditorApp-cKm4OFIF.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -3771,6 +3807,198 @@ function getParagraphs(state) {
     getBlockParagraphs
   );
 }
+function resolveEffectiveTableStyle(table, styles) {
+  var _a;
+  const named = resolveNamedTableStyle((_a = table.style) == null ? void 0 : _a.styleId, styles);
+  return mergeTableStyles(named.tableStyle, table.style);
+}
+function resolveTableParagraphInheritance(tableStyle, paragraphStyleId, styles) {
+  if (!tableStyle) return void 0;
+  const effectiveStyleId = paragraphStyleId ?? resolveDefaultParagraphStyleId(styles);
+  const named = resolveNamedParagraphStyle(effectiveStyleId, styles);
+  const inherited = {};
+  for (const [key, value] of Object.entries(tableStyle)) {
+    if (!(key in named)) {
+      inherited[key] = value;
+    }
+  }
+  return Object.keys(inherited).length > 0 ? inherited : void 0;
+}
+function mergeTableStyles(base, next) {
+  const conditionalFormats = {
+    ...(base == null ? void 0 : base.conditionalFormats) ?? {}
+  };
+  for (const [key, incoming] of Object.entries(
+    (next == null ? void 0 : next.conditionalFormats) ?? {}
+  )) {
+    const previous = conditionalFormats[key];
+    conditionalFormats[key] = {
+      ...previous ?? {},
+      ...incoming,
+      textStyle: { ...previous == null ? void 0 : previous.textStyle, ...incoming.textStyle },
+      paragraphStyle: {
+        ...previous == null ? void 0 : previous.paragraphStyle,
+        ...incoming.paragraphStyle
+      },
+      rowStyle: { ...previous == null ? void 0 : previous.rowStyle, ...incoming.rowStyle },
+      cellStyle: { ...previous == null ? void 0 : previous.cellStyle, ...incoming.cellStyle },
+      borders: { ...previous == null ? void 0 : previous.borders, ...incoming.borders },
+      tableStyle: mergeTableStyles(previous == null ? void 0 : previous.tableStyle, incoming.tableStyle)
+    };
+  }
+  return {
+    ...base ?? {},
+    ...next ?? {},
+    defaultCellMargins: {
+      ...(base == null ? void 0 : base.defaultCellMargins) ?? {},
+      ...(next == null ? void 0 : next.defaultCellMargins) ?? {}
+    },
+    borders: { ...(base == null ? void 0 : base.borders) ?? {}, ...(next == null ? void 0 : next.borders) ?? {} },
+    ...Object.keys(conditionalFormats).length > 0 ? { conditionalFormats } : {}
+  };
+}
+function resolveNamedTableStyle(styleId, styles, seen = /* @__PURE__ */ new Set()) {
+  var _a;
+  if (!styles) return { tableStyle: {} };
+  const effectiveId = styleId ?? ((_a = Object.values(styles).find(
+    (style2) => style2.type === "table" && style2.isDefault
+  )) == null ? void 0 : _a.id);
+  if (!effectiveId || seen.has(effectiveId)) return { tableStyle: {} };
+  const named = styles[effectiveId];
+  if (!named || named.type !== "table") return { tableStyle: {} };
+  seen.add(effectiveId);
+  const parent = resolveNamedTableStyle(named.basedOn, styles, seen);
+  return {
+    tableStyle: mergeTableStyles(parent.tableStyle, named.tableStyle),
+    paragraphStyle: {
+      ...parent.paragraphStyle ?? {},
+      ...named.paragraphStyle ?? {}
+    },
+    textStyle: {
+      ...parent.textStyle ?? {},
+      ...named.textStyle ?? {}
+    }
+  };
+}
+function conditionalKeys(options) {
+  const { rowIndex, columnIndex, rowCount, columnCount, tableStyle } = options;
+  const look = tableStyle.tblLook ?? {
+    firstRow: true,
+    lastRow: false,
+    firstCol: true,
+    lastCol: false,
+    noHBand: false,
+    noVBand: false
+  };
+  const firstRow = look.firstRow && rowIndex === 0;
+  const lastRow = look.lastRow && rowIndex === rowCount - 1 && rowIndex !== 0;
+  const firstCol = look.firstCol && columnIndex === 0;
+  const lastCol = look.lastCol && columnIndex === columnCount - 1 && columnIndex !== 0;
+  const keys = ["wholeTable"];
+  if (!look.noHBand && !firstRow && !lastRow) {
+    const body = rowIndex - (look.firstRow ? 1 : 0);
+    keys.push(
+      Math.floor(body / Math.max(1, tableStyle.rowBandSize ?? 1)) % 2 === 0 ? "band1Horz" : "band2Horz"
+    );
+  }
+  if (!look.noVBand && !firstCol && !lastCol) {
+    const body = columnIndex - (look.firstCol ? 1 : 0);
+    keys.push(
+      Math.floor(body / Math.max(1, tableStyle.colBandSize ?? 1)) % 2 === 0 ? "band1Vert" : "band2Vert"
+    );
+  }
+  if (lastCol) keys.push("lastCol");
+  if (firstCol) keys.push("firstCol");
+  if (lastRow) keys.push("lastRow");
+  if (firstRow) keys.push("firstRow");
+  if (firstRow && firstCol) keys.push("nwCell");
+  if (firstRow && lastCol) keys.push("neCell");
+  if (lastRow && firstCol) keys.push("swCell");
+  if (lastRow && lastCol) keys.push("seCell");
+  for (const flags of [options.rowFlags, options.cellFlags]) {
+    for (const [key, enabled2] of Object.entries(flags ?? {})) {
+      if (enabled2 && !keys.includes(key)) keys.push(key);
+      if (enabled2 === false) {
+        const index = keys.indexOf(key);
+        if (index >= 0) keys.splice(index, 1);
+      }
+    }
+  }
+  return keys;
+}
+function mergeConditionals(keys, formats) {
+  const merged = {};
+  for (const key of keys) {
+    const next = formats == null ? void 0 : formats[key];
+    if (!next) continue;
+    if (next.shading) merged.shading = next.shading;
+    if (next.textStyle)
+      merged.textStyle = { ...merged.textStyle, ...next.textStyle };
+    if (next.paragraphStyle)
+      merged.paragraphStyle = {
+        ...merged.paragraphStyle,
+        ...next.paragraphStyle
+      };
+    if (next.rowStyle)
+      merged.rowStyle = { ...merged.rowStyle, ...next.rowStyle };
+    if (next.cellStyle)
+      merged.cellStyle = { ...merged.cellStyle, ...next.cellStyle };
+    if (next.borders) merged.borders = { ...merged.borders, ...next.borders };
+    if (next.tableStyle)
+      merged.tableStyle = mergeTableStyles(merged.tableStyle, next.tableStyle);
+  }
+  return merged;
+}
+function resolveEffectiveTableCellFormatting(options) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+  const { table, rowIndex, cellIndex, visualColumnIndex, columnCount, styles } = options;
+  const named = resolveNamedTableStyle((_a = table.style) == null ? void 0 : _a.styleId, styles);
+  const baseTableStyle = mergeTableStyles(named.tableStyle, table.style);
+  const row = table.rows[rowIndex];
+  const cell = row == null ? void 0 : row.cells[cellIndex];
+  const keys = conditionalKeys({
+    rowIndex,
+    columnIndex: visualColumnIndex,
+    rowCount: table.rows.length,
+    columnCount,
+    tableStyle: baseTableStyle,
+    rowFlags: row == null ? void 0 : row.conditionalStyle,
+    cellFlags: cell == null ? void 0 : cell.conditionalStyle
+  });
+  const conditional = mergeConditionals(
+    keys,
+    baseTableStyle.conditionalFormats
+  );
+  const conditionalCell = {
+    ...((_b = baseTableStyle.defaultCellMargins) == null ? void 0 : _b.top) !== void 0 ? { paddingTop: baseTableStyle.defaultCellMargins.top } : {},
+    ...((_c = baseTableStyle.defaultCellMargins) == null ? void 0 : _c.right) !== void 0 ? { paddingRight: baseTableStyle.defaultCellMargins.right } : {},
+    ...((_d = baseTableStyle.defaultCellMargins) == null ? void 0 : _d.bottom) !== void 0 ? { paddingBottom: baseTableStyle.defaultCellMargins.bottom } : {},
+    ...((_e = baseTableStyle.defaultCellMargins) == null ? void 0 : _e.left) !== void 0 ? { paddingLeft: baseTableStyle.defaultCellMargins.left } : {},
+    ...((_f = baseTableStyle.defaultCellMargins) == null ? void 0 : _f.start) !== void 0 ? { paddingStart: baseTableStyle.defaultCellMargins.start } : {},
+    ...((_g = baseTableStyle.defaultCellMargins) == null ? void 0 : _g.end) !== void 0 ? { paddingEnd: baseTableStyle.defaultCellMargins.end } : {},
+    ...rowIndex === 0 && ((_h = baseTableStyle.borders) == null ? void 0 : _h.borderTop) ? { borderTop: baseTableStyle.borders.borderTop } : rowIndex > 0 && ((_i = baseTableStyle.borders) == null ? void 0 : _i.borderInsideH) ? { borderTop: baseTableStyle.borders.borderInsideH } : {},
+    ...rowIndex === table.rows.length - 1 && ((_j = baseTableStyle.borders) == null ? void 0 : _j.borderBottom) ? { borderBottom: baseTableStyle.borders.borderBottom } : rowIndex < table.rows.length - 1 && ((_k = baseTableStyle.borders) == null ? void 0 : _k.borderInsideH) ? { borderBottom: baseTableStyle.borders.borderInsideH } : {},
+    ...visualColumnIndex === 0 && ((_l = baseTableStyle.borders) == null ? void 0 : _l.borderLeft) ? { borderLeft: baseTableStyle.borders.borderLeft } : visualColumnIndex > 0 && ((_m = baseTableStyle.borders) == null ? void 0 : _m.borderInsideV) ? { borderLeft: baseTableStyle.borders.borderInsideV } : {},
+    ...visualColumnIndex === columnCount - 1 && ((_n = baseTableStyle.borders) == null ? void 0 : _n.borderRight) ? { borderRight: baseTableStyle.borders.borderRight } : visualColumnIndex < columnCount - 1 && ((_o = baseTableStyle.borders) == null ? void 0 : _o.borderInsideV) ? { borderRight: baseTableStyle.borders.borderInsideV } : {},
+    ...conditional.cellStyle ?? {},
+    ...conditional.borders ?? {},
+    ...conditional.shading ? { shading: conditional.shading } : {}
+  };
+  return {
+    tableStyle: mergeTableStyles(baseTableStyle, conditional.tableStyle),
+    rowStyle: { ...conditional.rowStyle ?? {}, ...(row == null ? void 0 : row.style) ?? {} },
+    cellStyle: { ...conditionalCell, ...(cell == null ? void 0 : cell.style) ?? {} },
+    paragraphStyle: {
+      ...named.paragraphStyle ?? {},
+      ...conditional.paragraphStyle ?? {}
+    },
+    textStyle: {
+      ...named.textStyle ?? {},
+      ...conditional.textStyle ?? {}
+    },
+    conditionalKeys: keys
+  };
+}
 function findParagraphIndex(paragraphs, paragraphId) {
   const index = paragraphs.findIndex(
     (paragraph) => paragraph.id === paragraphId
@@ -4766,7 +4994,7 @@ function ToolIcon(props) {
     children: (render2) => render2()()
   });
 }
-var _tmpl$$P = /* @__PURE__ */ template(`<div class=oasis-menubar role=menubar>`), _tmpl$2$y = /* @__PURE__ */ template(`<div class=oasis-menubar-dropdown role=menu>`), _tmpl$3$m = /* @__PURE__ */ template(`<div class=oasis-menubar-menu><div class=oasis-menubar-button role=menuitem aria-haspopup=true>`), _tmpl$4$g = /* @__PURE__ */ template(`<div class=oasis-menubar-separator role=separator>`), _tmpl$5$e = /* @__PURE__ */ template(`<span class=oasis-menubar-item-icon aria-hidden=true>`), _tmpl$6$7 = /* @__PURE__ */ template(`<span class=oasis-menubar-shortcut>`), _tmpl$7$3 = /* @__PURE__ */ template(`<i class=oasis-menubar-submenu-icon data-lucide=chevron-right>`), _tmpl$8$2 = /* @__PURE__ */ template(`<div class=oasis-menubar-submenu role=menu>`), _tmpl$9$1 = /* @__PURE__ */ template(`<div class=oasis-menubar-item role=menuitem><span class=oasis-menubar-item-main><span>`);
+var _tmpl$$P = /* @__PURE__ */ template(`<div class=oasis-menubar role=menubar>`), _tmpl$2$y = /* @__PURE__ */ template(`<div class=oasis-menubar-dropdown role=menu>`), _tmpl$3$m = /* @__PURE__ */ template(`<div class=oasis-menubar-menu><div class=oasis-menubar-button role=menuitem aria-haspopup=true>`), _tmpl$4$h = /* @__PURE__ */ template(`<div class=oasis-menubar-separator role=separator>`), _tmpl$5$e = /* @__PURE__ */ template(`<span class=oasis-menubar-item-icon aria-hidden=true>`), _tmpl$6$7 = /* @__PURE__ */ template(`<span class=oasis-menubar-shortcut>`), _tmpl$7$3 = /* @__PURE__ */ template(`<i class=oasis-menubar-submenu-icon data-lucide=chevron-right>`), _tmpl$8$2 = /* @__PURE__ */ template(`<div class=oasis-menubar-submenu role=menu>`), _tmpl$9$1 = /* @__PURE__ */ template(`<div class=oasis-menubar-item role=menuitem><span class=oasis-menubar-item-main><span>`);
 function Menubar(props) {
   const t = useI18n();
   const [activeMenu, setActiveMenu] = createSignal(null);
@@ -4900,7 +5128,7 @@ function MenuNode(props) {
   } = props;
   const isSeparator = (_a = node.item) == null ? void 0 : _a.separator;
   if (isSeparator) {
-    return _tmpl$4$g();
+    return _tmpl$4$h();
   }
   const hasChildren = node.children.length > 0;
   const [showSub, setShowSub] = createSignal(false);
@@ -11830,7 +12058,7 @@ function emuToPx$1(value) {
 function clampFinite(value, fallback) {
   return Number.isFinite(value) ? value : fallback;
 }
-function resolveAlignedOffset(align, containerSize, boxSize) {
+function resolveAlignedOffset(align, containerSize, boxSize, pageIndex = 0) {
   switch (align) {
     case "left":
     case "top":
@@ -11841,10 +12069,52 @@ function resolveAlignedOffset(align, containerSize, boxSize) {
     case "right":
     case "bottom":
       return containerSize - boxSize;
+    case "inside":
+      return pageIndex % 2 === 0 ? 0 : containerSize - boxSize;
+    case "outside":
+      return pageIndex % 2 === 0 ? containerSize - boxSize : 0;
     default:
       return null;
   }
 }
+function resolveFloatingTableRect(options) {
+  const {
+    floating,
+    pageSettings,
+    contentLeft,
+    contentTop,
+    contentWidth,
+    anchorTop,
+    width,
+    height,
+    pageIndex
+  } = options;
+  const horizontalPage = floating.horizontalAnchor === "page";
+  const verticalPage = floating.verticalAnchor === "page";
+  const verticalMargin = floating.verticalAnchor === "margin";
+  const hBase = horizontalPage ? 0 : contentLeft;
+  const hSize = horizontalPage ? pageSettings.width : contentWidth;
+  const vBase = verticalPage ? 0 : verticalMargin ? contentTop : anchorTop;
+  const vSize = verticalPage ? pageSettings.height : verticalMargin ? Math.max(1, pageSettings.height - contentTop) : Math.max(1, pageSettings.height - anchorTop);
+  const alignedX = resolveAlignedOffset(
+    floating.xAlign,
+    hSize,
+    width,
+    pageIndex
+  );
+  const alignedY = resolveAlignedOffset(
+    floating.yAlign,
+    vSize,
+    height,
+    pageIndex
+  );
+  return {
+    x: hBase + (alignedX ?? (floating.x ?? 0) * PX_PER_POINT),
+    y: vBase + (alignedY ?? (floating.y ?? 0) * PX_PER_POINT),
+    width: Math.max(1, width),
+    height: Math.max(1, height)
+  };
+}
 function getTextBoxFloatingGeometry(textBox, heightOverride) {
   return {
     width: textBox.width,
@@ -12168,7 +12438,7 @@ function projectParagraphLayout(paragraph, pageIndex, totalPages, styles, conten
   cacheForParagraph.set(cacheKey, result);
   return result;
 }
-function projectParagraphLayoutWithExclusions(paragraph, pageSettings, contentWidth, measurer = domTextMeasurer, pageIndex, totalPages, styles, defaultTabStop, resolveTextBoxHeight) {
+function projectParagraphLayoutWithExclusions(paragraph, pageSettings, contentWidth, measurer = domTextMeasurer, pageIndex, totalPages, styles, defaultTabStop, resolveTextBoxHeight, externalExclusions = []) {
   const preliminary = projectParagraphLayout(
     paragraph,
     pageIndex,
@@ -12187,7 +12457,7 @@ function projectParagraphLayoutWithExclusions(paragraph, pageSettings, contentWi
       return (((_a = f.textBox) == null ? void 0 : _a.floating) ?? ((_b = f.image) == null ? void 0 : _b.floating)) !== void 0;
     }
   );
-  if (!hasFloatingObject && !paragraph.dropCap) {
+  if (!hasFloatingObject && !paragraph.dropCap && externalExclusions.length === 0) {
     return preliminary;
   }
   const fontSize = estimateParagraphFontSize(paragraph, styles);
@@ -12199,6 +12469,7 @@ function projectParagraphLayoutWithExclusions(paragraph, pageSettings, contentWi
     contentWidth,
     resolveTextBoxHeight
   }) : [];
+  exclusions.push(...externalExclusions);
   if (paragraph.dropCap) {
     const dropCapExclusion = resolveDropCapExclusion({
       dropCap: paragraph.dropCap,
@@ -12624,12 +12895,65 @@ function getCachedTableColumnGeometry(table, contentWidthPx) {
 }
 function estimateTableRowHeight(row, styles, measurer, defaultTabStop, contentWidth, table, rowIndex) {
   var _a, _b;
-  if ((_a = row.style) == null ? void 0 : _a.hidden) {
+  const tableEntries = table ? buildTableCellLayout(table) : [];
+  const columnCount = Math.max(
+    1,
+    ...tableEntries.map(
+      (entry) => entry.visualColumnIndex + Math.max(1, entry.colSpan)
+    )
+  );
+  const rowFormatting = table && rowIndex !== void 0 ? (() => {
+    const entry = tableEntries.find(
+      (candidate) => candidate.rowIndex === rowIndex
+    );
+    return entry ? resolveEffectiveTableCellFormatting({
+      table,
+      rowIndex,
+      cellIndex: entry.cellIndex,
+      visualColumnIndex: entry.visualColumnIndex,
+      columnCount,
+      styles
+    }) : void 0;
+  })() : void 0;
+  if ((_a = (rowFormatting == null ? void 0 : rowFormatting.rowStyle) ?? row.style) == null ? void 0 : _a.hidden) {
     return 0;
   }
   const geometry = table && typeof contentWidth === "number" ? getCachedTableColumnGeometry(table, contentWidth) : null;
-  const cellHeights = row.cells.map((cell, cellIndex) => {
+  const cellHeights = row.cells.map((sourceCell, cellIndex) => {
     var _a2;
+    const entry = rowIndex !== void 0 ? tableEntries.find(
+      (candidate) => candidate.rowIndex === rowIndex && candidate.cellIndex === cellIndex
+    ) : void 0;
+    const formatting = table && rowIndex !== void 0 && entry ? resolveEffectiveTableCellFormatting({
+      table,
+      rowIndex,
+      cellIndex,
+      visualColumnIndex: entry.visualColumnIndex,
+      columnCount,
+      styles
+    }) : void 0;
+    const cell = {
+      ...sourceCell,
+      style: (formatting == null ? void 0 : formatting.cellStyle) ?? sourceCell.style,
+      blocks: sourceCell.blocks.map((paragraph) => {
+        var _a3;
+        return {
+          ...paragraph,
+          style: {
+            ...resolveTableParagraphInheritance(
+              formatting == null ? void 0 : formatting.paragraphStyle,
+              (_a3 = paragraph.style) == null ? void 0 : _a3.styleId,
+              styles
+            ),
+            ...paragraph.style
+          },
+          runs: paragraph.runs.map((run) => ({
+            ...run,
+            styles: { ...formatting == null ? void 0 : formatting.textStyle, ...run.styles }
+          }))
+        };
+      })
+    };
     if (cell.vMerge === "continue") return 0;
     let columnWidthPx;
     if (geometry && typeof rowIndex === "number") {
@@ -12686,13 +13010,16 @@ function estimateTableRowHeight(row, styles, measurer, defaultTabStop, contentWi
     ...cellHeights,
     DEFAULT_FONT_SIZE$1 * DEFAULT_LINE_HEIGHT
   );
-  const explicitHeight = parseTableRowHeightToPx((_b = row.style) == null ? void 0 : _b.height);
+  const explicitHeight = parseTableRowHeightToPx(
+    (_b = (rowFormatting == null ? void 0 : rowFormatting.rowStyle) ?? row.style) == null ? void 0 : _b.height
+  );
   return Math.max(contentHeight, explicitHeight ?? 0) + DEFAULT_TABLE_ROW_VERTICAL_SPACING;
 }
 function getTableHeaderRowCount(table) {
+  var _a;
   let count = 0;
   for (const row of table.rows) {
-    if (!row.isHeader) {
+    if (!(((_a = row.style) == null ? void 0 : _a.isHeader) ?? row.isHeader)) {
       break;
     }
     count += 1;
@@ -12801,6 +13128,7 @@ function projectHeaderFooterBlocksWithDependencies(blocks, deps, context2 = {})
     defaultTabStop
   } = context2;
   return blocks.map((block, index) => {
+    var _a, _b;
     if (block.type === "paragraph") {
       const layout = deps.projectParagraphLayout(
         block,
@@ -12822,18 +13150,20 @@ function projectHeaderFooterBlocksWithDependencies(blocks, deps, context2 = {})
         sourceBlock: block
       };
     }
+    const tableHeight = (measuredHeights == null ? void 0 : measuredHeights[block.id]) ?? deps.estimateTableBlockHeight(
+      block,
+      styles,
+      contentWidth,
+      measurer,
+      defaultTabStop
+    );
     return {
       blockId: block.id,
       sourceBlockId: block.id,
       blockType: block.type,
       globalIndex: index,
-      estimatedHeight: (measuredHeights == null ? void 0 : measuredHeights[block.id]) ?? deps.estimateTableBlockHeight(
-        block,
-        styles,
-        contentWidth,
-        measurer,
-        defaultTabStop
-      ),
+      estimatedHeight: ((_a = block.style) == null ? void 0 : _a.floating) ? 0 : tableHeight,
+      floatingTableHeight: ((_b = block.style) == null ? void 0 : _b.floating) ? tableHeight : void 0,
       sourceBlock: block
     };
   });
@@ -12933,6 +13263,7 @@ class PaginationTrack {
     __publicField(this, "pages");
     __publicField(this, "blocks");
     __publicField(this, "height");
+    __publicField(this, "floatingExclusions", []);
     this.pageOffset = pageOffset;
     this.maxPageHeight = maxPageHeight;
     this.reservedHeightByPageIndex = reservedHeightByPageIndex;
@@ -12977,6 +13308,7 @@ class PaginationTrack {
     });
     this.blocks = [];
     this.height = 0;
+    this.floatingExclusions = [];
   }
   /** Flushes the trailing track and guarantees at least one page exists. */
   finalize() {
@@ -12996,6 +13328,21 @@ class PaginationTrack {
   }
 }
 const TEXT_BOX_AUTOFIT_SAFETY_PX$1 = 2;
+function registerParagraphFloatingExclusions(options) {
+  const exclusions = collectParagraphFloatingExclusions({
+    fragments: options.layout.fragments,
+    preliminaryLines: options.layout.lines,
+    pageSettings: options.params.pageSettings,
+    contentWidth: options.params.contentWidth,
+    resolveTextBoxHeight: options.resolveTextBoxHeight
+  });
+  options.track.floatingExclusions.push(
+    ...exclusions.map((exclusion) => ({
+      ...exclusion,
+      y: exclusion.y + options.blockTop
+    }))
+  );
+}
 function estimateTextBoxAutoFitHeight(textBox, styles, measurer, pageIndex, totalPages, defaultTabStop) {
   var _a, _b, _c, _d, _e;
   if (!((_a = textBox.body) == null ? void 0 : _a.autoFit)) {
@@ -13052,6 +13399,14 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
     measuredParagraphLayouts
   } = params;
   const pageIndex = track.pageIndex;
+  const resolveTextBoxHeight = (textBox) => estimateTextBoxAutoFitHeight(
+    textBox,
+    styles,
+    measurer,
+    pageIndex,
+    totalPages,
+    defaultTabStop
+  );
   const projectedParagraphLayout = projectParagraphLayoutWithExclusions(
     sourceBlock,
     pageSettings,
@@ -13061,14 +13416,11 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
     totalPages,
     styles,
     defaultTabStop,
-    (textBox) => estimateTextBoxAutoFitHeight(
-      textBox,
-      styles,
-      measurer,
-      pageIndex,
-      totalPages,
-      defaultTabStop
-    )
+    resolveTextBoxHeight,
+    track.floatingExclusions.map((exclusion) => ({
+      ...exclusion,
+      y: exclusion.y - track.height
+    }))
   );
   const measuredParagraphLayout = measuredParagraphLayouts == null ? void 0 : measuredParagraphLayouts[sourceBlock.id];
   const paragraphLayout = measuredParagraphLayout && isMeasuredLayoutCurrent(projectedParagraphLayout, measuredParagraphLayout) ? applyMeasuredLineGeometry(
@@ -13150,6 +13502,13 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
       sourceBlock
     });
     track.height += measuredHeight;
+    registerParagraphFloatingExclusions({
+      track,
+      layout: paragraphLayout,
+      blockTop: track.height - measuredHeight + (paragraphStyle.spacingBefore ?? 0),
+      params,
+      resolveTextBoxHeight
+    });
     return;
   }
   let startLineIndex = 0;
@@ -13261,6 +13620,15 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
       sourceBlock
     });
     track.height += measuredHeight;
+    if (startLineIndex === 0) {
+      registerParagraphFloatingExclusions({
+        track,
+        layout: segmentLayout,
+        blockTop: track.height - measuredHeight + (paragraphStyle.spacingBefore ?? 0),
+        params,
+        resolveTextBoxHeight
+      });
+    }
     startLineIndex = lineEndIndex;
     segmentIndex += 1;
     if (startLineIndex < paragraphLayout.lines.length) {
@@ -13453,7 +13821,21 @@ function positionsFinishedRow(row, ends) {
     }
   );
 }
+function resolveFloatingTableWidth(table, contentWidth) {
+  var _a, _b;
+  const width = (_a = table.style) == null ? void 0 : _a.width;
+  if (typeof width === "number") return width * PX_PER_POINT;
+  if (typeof width === "string" && width.endsWith("%")) {
+    const percent = Number.parseFloat(width);
+    if (Number.isFinite(percent)) return contentWidth * (percent / 100);
+  }
+  if ((_b = table.gridCols) == null ? void 0 : _b.length) {
+    return table.gridCols.reduce((sum, value) => sum + value, 0) * PX_PER_POINT;
+  }
+  return contentWidth;
+}
 function paginateTableBlock(track, params, sourceBlock, index) {
+  var _a;
   const { contentWidth, measurer, styles, defaultTabStop, measuredHeights } = params;
   const tableHeight = (measuredHeights == null ? void 0 : measuredHeights[sourceBlock.id]) ?? estimateTableBlockHeight(
     sourceBlock,
@@ -13462,6 +13844,60 @@ function paginateTableBlock(track, params, sourceBlock, index) {
     measurer,
     defaultTabStop
   );
+  if ((_a = sourceBlock.style) == null ? void 0 : _a.floating) {
+    track.blocks.push({
+      blockId: sourceBlock.id,
+      sourceBlockId: sourceBlock.id,
+      blockType: sourceBlock.type,
+      globalIndex: index,
+      estimatedHeight: 0,
+      floatingTableHeight: tableHeight,
+      sourceBlock
+    });
+    const pageContentLeft = params.pageSettings.margins.left + params.pageSettings.margins.gutter;
+    const pageContentTop = getPageBodyTop(params.pageSettings);
+    const raw = resolveFloatingTableRect({
+      floating: sourceBlock.style.floating,
+      pageSettings: params.pageSettings,
+      contentLeft: pageContentLeft,
+      contentTop: pageContentTop,
+      contentWidth,
+      anchorTop: pageContentTop + track.height,
+      width: resolveFloatingTableWidth(sourceBlock, contentWidth),
+      height: tableHeight,
+      pageIndex: track.pageIndex
+    });
+    const exclusion = {
+      x: raw.x - pageContentLeft - (sourceBlock.style.floating.distanceLeft ?? 0) * PX_PER_POINT,
+      y: raw.y - pageContentTop - (sourceBlock.style.floating.distanceTop ?? 0) * PX_PER_POINT,
+      width: raw.width + ((sourceBlock.style.floating.distanceLeft ?? 0) + (sourceBlock.style.floating.distanceRight ?? 0)) * PX_PER_POINT,
+      height: raw.height + ((sourceBlock.style.floating.distanceTop ?? 0) + (sourceBlock.style.floating.distanceBottom ?? 0)) * PX_PER_POINT,
+      wrap: "square",
+      sourceRunId: `table:${sourceBlock.id}`
+    };
+    let collisionOffsetY = 0;
+    if (sourceBlock.style.tblOverlap === "never") {
+      for (const existing of track.floatingExclusions) {
+        if (!existing.sourceRunId.startsWith("table:")) continue;
+        const overlaps = exclusion.x < existing.x + existing.width && exclusion.x + exclusion.width > existing.x && exclusion.y + collisionOffsetY < existing.y + existing.height && exclusion.y + collisionOffsetY + exclusion.height > existing.y;
+        if (overlaps) {
+          collisionOffsetY = Math.max(
+            collisionOffsetY,
+            existing.y + existing.height - exclusion.y
+          );
+        }
+      }
+    }
+    const layoutBlock = track.blocks.at(-1);
+    if (layoutBlock && collisionOffsetY > 0) {
+      layoutBlock.floatingTableOffsetY = collisionOffsetY;
+    }
+    track.floatingExclusions.push({
+      ...exclusion,
+      y: exclusion.y + collisionOffsetY
+    });
+    return;
+  }
   const maxHeightForCurrentPage = track.currentMaxHeight;
   const firstRow = sourceBlock.rows[0];
   const canSplitSingleRow = canSplitTableRow(firstRow);
@@ -14705,7 +15141,7 @@ function parseDimensionToPx(value) {
   const parsed = Number.parseFloat(trimmed);
   return Number.isFinite(parsed) ? parsed : null;
 }
-function resolveTableWidth(table, contentWidth) {
+function resolveCanvasTableWidth(table, contentWidth) {
   var _a;
   const raw = (_a = table.style) == null ? void 0 : _a.width;
   if (typeof raw === "number") return Math.max(24, toPx(raw));
@@ -14784,9 +15220,9 @@ function resolveVerticalContentOffset(cell, contentHeightPx, contentNaturalHeigh
   return 0;
 }
 function buildCanvasTableLayout(options) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
   const {
-    table,
+    table: sourceTable,
     state,
     pageIndex,
     originX,
@@ -14794,7 +15230,11 @@ function buildCanvasTableLayout(options) {
     contentWidth,
     estimatedHeight
   } = options;
-  const tableWidth = resolveTableWidth(table, contentWidth);
+  const table = {
+    ...sourceTable,
+    style: resolveEffectiveTableStyle(sourceTable, state.document.styles)
+  };
+  const tableWidth = resolveCanvasTableWidth(table, contentWidth);
   const tableLeft = originX + resolveTableIndentLeft(table);
   const tableEntries = buildTableCellLayout(table);
   const unsupported = [];
@@ -14842,15 +15282,62 @@ function buildCanvasTableLayout(options) {
       (entry) => [`${entry.rowIndex}:${entry.cellIndex}`, entry]
     )
   );
+  const effectiveRowStyles = table.rows.map((row, rowIndex) => {
+    const entry = tableEntries.find(
+      (candidate) => candidate.rowIndex === rowIndex
+    );
+    return entry ? resolveEffectiveTableCellFormatting({
+      table: sourceTable,
+      rowIndex,
+      cellIndex: entry.cellIndex,
+      visualColumnIndex: entry.visualColumnIndex,
+      columnCount: visualColumnCount,
+      styles: state.document.styles
+    }).rowStyle : row.style;
+  });
   const prepared = [];
   for (let rowIndex = 0; rowIndex < table.rows.length; rowIndex += 1) {
     const row = table.rows[rowIndex];
-    if ((_f = row.style) == null ? void 0 : _f.hidden) {
+    if ((_f = effectiveRowStyles[rowIndex]) == null ? void 0 : _f.hidden) {
       continue;
     }
     for (let cellIndex = 0; cellIndex < row.cells.length; cellIndex += 1) {
-      const cell = row.cells[cellIndex];
+      const sourceCell = row.cells[cellIndex];
       const entry = cellEntriesByKey.get(`${rowIndex}:${cellIndex}`);
+      if (!entry) {
+        continue;
+      }
+      const formatting = resolveEffectiveTableCellFormatting({
+        table: sourceTable,
+        rowIndex,
+        cellIndex,
+        visualColumnIndex: entry.visualColumnIndex,
+        columnCount: visualColumnCount,
+        styles: state.document.styles
+      });
+      const cell = {
+        ...sourceCell,
+        style: formatting.cellStyle,
+        blocks: sourceCell.blocks.map((paragraph) => {
+          var _a2;
+          return {
+            ...paragraph,
+            style: {
+              ...resolveTableParagraphInheritance(
+                formatting.paragraphStyle,
+                (_a2 = paragraph.style) == null ? void 0 : _a2.styleId,
+                state.document.styles
+              ),
+              ...paragraph.style
+            },
+            runs: paragraph.runs.map((run) => ({
+              ...run,
+              styles: { ...formatting.textStyle, ...run.styles }
+            }))
+          };
+        })
+      };
+      const effectiveRow = formatting.rowStyle;
       const rowSpan = Math.max(1, cell.rowSpan ?? 1);
       if (rowSpan > 1) {
         unsupported.push("unsupported:v-span");
@@ -14858,9 +15345,6 @@ function buildCanvasTableLayout(options) {
       if (cell.vMerge === "continue" || cell.vMerge === "restart") {
         unsupported.push("unsupported:v-merge");
       }
-      if (!entry) {
-        continue;
-      }
       const visualCol = entry.visualColumnIndex;
       const colSpan = Math.max(1, entry.colSpan);
       const width = Math.max(
@@ -14868,11 +15352,23 @@ function buildCanvasTableLayout(options) {
         (columnOffsets[visualCol + colSpan] ?? tableWidth) - (columnOffsets[visualCol] ?? 0)
       );
       const padding = resolveCellPadding(cell);
+      const logicalLeft = ((_g = table.style) == null ? void 0 : _g.bidiVisual) ? (_h = cell.style) == null ? void 0 : _h.borderEnd : (_i = cell.style) == null ? void 0 : _i.borderStart;
+      const logicalRight = ((_j = table.style) == null ? void 0 : _j.bidiVisual) ? (_k = cell.style) == null ? void 0 : _k.borderStart : (_l = cell.style) == null ? void 0 : _l.borderEnd;
       const borders = {
-        top: resolveBorder((_g = cell.style) == null ? void 0 : _g.borderTop),
-        right: resolveBorder(((_h = cell.style) == null ? void 0 : _h.borderRight) ?? ((_i = cell.style) == null ? void 0 : _i.borderEnd)),
-        bottom: resolveBorder((_j = cell.style) == null ? void 0 : _j.borderBottom),
-        left: resolveBorder(((_k = cell.style) == null ? void 0 : _k.borderLeft) ?? ((_l = cell.style) == null ? void 0 : _l.borderStart))
+        top: resolveBorder((_m = cell.style) == null ? void 0 : _m.borderTop),
+        right: resolveBorder(((_n = cell.style) == null ? void 0 : _n.borderRight) ?? logicalRight),
+        bottom: resolveBorder((_o = cell.style) == null ? void 0 : _o.borderBottom),
+        left: resolveBorder(((_p = cell.style) == null ? void 0 : _p.borderLeft) ?? logicalLeft),
+        ...((_q = cell.style) == null ? void 0 : _q.borderTopLeftToBottomRight) ? {
+          topLeftToBottomRight: resolveBorder(
+            cell.style.borderTopLeftToBottomRight
+          )
+        } : {},
+        ...((_r = cell.style) == null ? void 0 : _r.borderTopRightToBottomLeft) ? {
+          topRightToBottomLeft: resolveBorder(
+            cell.style.borderTopRightToBottomLeft
+          )
+        } : {}
       };
       const contentWidthPx = Math.max(
         MIN_TABLE_CELL_CONTENT_WIDTH_PX,
@@ -14881,8 +15377,8 @@ function buildCanvasTableLayout(options) {
       const verticalMode = resolveCellVerticalMode(cell);
       const isRotated = verticalMode === "rotate-cw" || verticalMode === "rotate-ccw";
       const isStacked = verticalMode === "stack";
-      const explicitRowHeightPx = parseDimensionToPx((_m = row.style) == null ? void 0 : _m.height);
-      const wrapWidth = isRotated || ((_n = cell.style) == null ? void 0 : _n.noWrap) ? isRotated && explicitRowHeightPx !== null && explicitRowHeightPx > 0 ? Math.max(
+      const explicitRowHeightPx = parseDimensionToPx(effectiveRow.height);
+      const wrapWidth = isRotated || ((_s = cell.style) == null ? void 0 : _s.noWrap) ? isRotated && explicitRowHeightPx !== null && explicitRowHeightPx > 0 ? Math.max(
         MIN_TABLE_CELL_CONTENT_WIDTH_PX,
         explicitRowHeightPx - borders.top.width - borders.bottom.width - padding.top - padding.bottom
       ) : NO_WRAP_WIDTH_PX : contentWidthPx;
@@ -14906,7 +15402,7 @@ function buildCanvasTableLayout(options) {
             spacingAfter
           });
           const hasExplicitRowHeight = explicitRowHeightPx !== null && explicitRowHeightPx > 0;
-          const paragraphStyleSize = ((_p = (_o = paragraph.runs[0]) == null ? void 0 : _o.styles) == null ? void 0 : _p.fontSize) ?? 14.6667;
+          const paragraphStyleSize = ((_u = (_t = paragraph.runs[0]) == null ? void 0 : _t.styles) == null ? void 0 : _u.fontSize) ?? 14.6667;
           contentNaturalHeightPx = Math.max(
             contentNaturalHeightPx,
             hasExplicitRowHeight ? paragraphStyleSize * 1.25 : stackLength
@@ -14920,7 +15416,7 @@ function buildCanvasTableLayout(options) {
           state.document.styles,
           wrapWidth,
           void 0,
-          (_q = state.document.settings) == null ? void 0 : _q.defaultTabStop
+          (_v = state.document.settings) == null ? void 0 : _v.defaultTabStop
         );
         const linesBottom = projected.lines.length > 0 ? Math.max(...projected.lines.map((line) => line.top + line.height)) : 1;
         let effectiveSpacingBefore = spacingBefore;
@@ -14987,17 +15483,18 @@ function buildCanvasTableLayout(options) {
   }
   const rowCount = Math.max(1, table.rows.length);
   const explicitRowHeights = table.rows.map((row) => {
-    var _a2, _b2;
-    if ((_a2 = row.style) == null ? void 0 : _a2.hidden) {
+    const rowIndex = table.rows.indexOf(row);
+    const effective = effectiveRowStyles[rowIndex];
+    if (effective == null ? void 0 : effective.hidden) {
       return 0;
     }
-    const explicit = parseDimensionToPx((_b2 = row.style) == null ? void 0 : _b2.height);
+    const explicit = parseDimensionToPx(effective == null ? void 0 : effective.height);
     return explicit !== null && explicit > 0 ? explicit : null;
   });
   const fallbackPerRow = estimatedHeight > 0 ? estimatedHeight / rowCount : DEFAULT_TABLE_ROW_HEIGHT;
   const rowHeights = [];
   for (let rowIndex = 0; rowIndex < table.rows.length; rowIndex += 1) {
-    if ((_s = (_r = table.rows[rowIndex]) == null ? void 0 : _r.style) == null ? void 0 : _s.hidden) {
+    if ((_w = effectiveRowStyles[rowIndex]) == null ? void 0 : _w.hidden) {
       rowHeights[rowIndex] = 0;
       continue;
     }
@@ -15081,12 +15578,13 @@ function buildCanvasTableLayout(options) {
       contentTop,
       contentWidth: contentWidthPx,
       contentHeight: contentHeightPx,
-      shading: (_t = cell.style) == null ? void 0 : _t.shading,
+      shading: (_x = cell.style) == null ? void 0 : _x.shading,
       anchorPosition,
       padding,
       borders,
       paragraphs,
-      verticalMode: cellEntry.verticalMode
+      verticalMode: cellEntry.verticalMode,
+      revision: ((_y = cell.style) == null ? void 0 : _y.revision) ?? (((_z = cell.style) == null ? void 0 : _z.propertyRevision) ? { ...cell.style.propertyRevision, type: "property" } : void 0)
     });
   }
   return {
@@ -15443,6 +15941,7 @@ function buildCanvasLayoutSnapshot(options) {
   const floatingImages = [];
   const inlineTextBoxes = [];
   const floatingTextBoxes = [];
+  const floatingTables = [];
   const unsupportedRegions = [];
   for (const page of documentLayout.pages) {
     const pageElement = canvasPages.find(
@@ -15478,7 +15977,7 @@ function buildCanvasLayoutSnapshot(options) {
     const contentLeft = pageRect.left + page.pageSettings.margins.left + page.pageSettings.margins.gutter;
     const contentWidth = getPageContentWidth(page.pageSettings);
     const collectParagraphBlock = (zone, blocks, startTop, options2 = {}) => {
-      var _a;
+      var _a, _b, _c;
       let cursorY = startTop;
       let blockContentLeft = options2.contentLeft ?? contentLeft;
       let blockContentWidth = options2.contentWidth ?? contentWidth;
@@ -15592,15 +16091,45 @@ function buildCanvasLayoutSnapshot(options) {
             })
           );
         } else if (block.sourceBlock.type === "table") {
+          const floating = (_b = block.sourceBlock.style) == null ? void 0 : _b.floating;
+          const floatingRect = floating ? resolveFloatingTableRect({
+            floating,
+            pageSettings: page.pageSettings,
+            contentLeft: blockContentLeft - pageRect.left,
+            contentTop: startTop - pageRect.top,
+            contentWidth: blockContentWidth,
+            anchorTop: cursorY - pageRect.top,
+            width: resolveCanvasTableWidth(
+              block.sourceBlock,
+              blockContentWidth
+            ),
+            height: block.floatingTableHeight ?? 1,
+            pageIndex: page.index
+          }) : void 0;
+          if (floatingRect) {
+            floatingRect.y += block.floatingTableOffsetY ?? 0;
+          }
+          if (floatingRect) {
+            floatingTables.push({
+              tableId: block.sourceBlock.id,
+              zone,
+              footnoteId: blockFootnoteId,
+              pageIndex: page.index,
+              left: pageRect.left + floatingRect.x,
+              top: pageRect.top + floatingRect.y,
+              width: floatingRect.width,
+              height: floatingRect.height
+            });
+          }
           const segmentTable = block.tableSegment ? buildSegmentTable(block.sourceBlock, block.tableSegment) : block.sourceBlock;
           const tableLayout = buildCanvasTableLayout({
             table: segmentTable,
             state,
             pageIndex: page.index,
-            originX: blockContentLeft,
-            originY: cursorY,
+            originX: floatingRect ? pageRect.left + floatingRect.x : blockContentLeft,
+            originY: floatingRect ? pageRect.top + floatingRect.y : cursorY,
             contentWidth: blockContentWidth,
-            estimatedHeight: block.estimatedHeight
+            estimatedHeight: block.floatingTableHeight ?? block.estimatedHeight
           });
           for (const reason of tableLayout.unsupported) {
             unsupportedRegions.push({
@@ -15678,7 +16207,8 @@ function buildCanvasLayoutSnapshot(options) {
                   top: cell.top,
                   width: cell.width,
                   height: cell.height,
-                  anchorPosition: cell.anchorPosition
+                  anchorPosition: cell.anchorPosition,
+                  revisionId: (_c = cell.revision) == null ? void 0 : _c.id
                 }
               });
               inlineImages.push(
@@ -15801,6 +16331,7 @@ function buildCanvasLayoutSnapshot(options) {
     floatingImages,
     inlineTextBoxes,
     floatingTextBoxes,
+    floatingTables,
     unsupportedRegions
   };
 }
@@ -15856,7 +16387,7 @@ function getCaretRectFromSnapshot(snapshot, position2, paragraphOffset) {
   );
   return rectFromBox(slot.left, slot.top, 1, slot.height || line.height);
 }
-var _tmpl$$N = /* @__PURE__ */ template(`<span class=oasis-outline-title>`), _tmpl$2$x = /* @__PURE__ */ template(`<div class=oasis-outline-list>`), _tmpl$3$l = /* @__PURE__ */ template(`<div class=oasis-outline-panel><div class=oasis-outline-header><button class=oasis-outline-toggle><i>`), _tmpl$4$f = /* @__PURE__ */ template(`<div class=oasis-outline-empty>`), _tmpl$5$d = /* @__PURE__ */ template(`<div class=oasis-outline-item>`);
+var _tmpl$$N = /* @__PURE__ */ template(`<span class=oasis-outline-title>`), _tmpl$2$x = /* @__PURE__ */ template(`<div class=oasis-outline-list>`), _tmpl$3$l = /* @__PURE__ */ template(`<div class=oasis-outline-panel><div class=oasis-outline-header><button class=oasis-outline-toggle><i>`), _tmpl$4$g = /* @__PURE__ */ template(`<div class=oasis-outline-empty>`), _tmpl$5$d = /* @__PURE__ */ template(`<div class=oasis-outline-item>`);
 function OutlinePanel(props) {
   const t = useI18n();
   const [collapsed, setCollapsed] = createSignal(props.defaultCollapsed ?? false);
@@ -15949,7 +16480,7 @@ function OutlinePanel(props) {
           },
           get fallback() {
             return (() => {
-              var _el$7 = _tmpl$4$f();
+              var _el$7 = _tmpl$4$g();
               insert(_el$7, () => t("outline.empty"));
               return _el$7;
             })();
@@ -16424,7 +16955,7 @@ function Popover(props) {
     }
   })];
 }
-var _tmpl$$J = /* @__PURE__ */ template(`<div>`), _tmpl$2$u = /* @__PURE__ */ template(`<div class=oasis-editor-toolbar-dropdown>`), _tmpl$3$k = /* @__PURE__ */ template(`<i>`), _tmpl$4$e = /* @__PURE__ */ template(`<span class=oasis-editor-tool-button-label>`), _tmpl$5$c = /* @__PURE__ */ template(`<i data-lucide=chevron-down class=oasis-editor-dropdown-chevron>`), _tmpl$6$6 = /* @__PURE__ */ template(`<button type=button class="oasis-editor-tool-button oasis-editor-tool-button-dropdown"aria-haspopup=menu>`);
+var _tmpl$$J = /* @__PURE__ */ template(`<div>`), _tmpl$2$u = /* @__PURE__ */ template(`<div class=oasis-editor-toolbar-dropdown>`), _tmpl$3$k = /* @__PURE__ */ template(`<i>`), _tmpl$4$f = /* @__PURE__ */ template(`<span class=oasis-editor-tool-button-label>`), _tmpl$5$c = /* @__PURE__ */ template(`<i data-lucide=chevron-down class=oasis-editor-dropdown-chevron>`), _tmpl$6$6 = /* @__PURE__ */ template(`<button type=button class="oasis-editor-tool-button oasis-editor-tool-button-dropdown"aria-haspopup=menu>`);
 function Menu(props) {
   const [open, setOpen] = createSignal(false);
   const ariaLabel = () => props.tooltip || props.label || "";
@@ -16462,7 +16993,7 @@ function Menu(props) {
             return props.label;
           },
           get children() {
-            var _el$5 = _tmpl$4$e();
+            var _el$5 = _tmpl$4$f();
             insert(_el$5, () => props.label);
             return _el$5;
           }
@@ -16620,7 +17151,7 @@ function SplitButton(props) {
   });
 }
 delegateEvents(["click"]);
-var _tmpl$$F = /* @__PURE__ */ template(`<i data-lucide=type>`), _tmpl$2$t = /* @__PURE__ */ template(`<button type=button class=oasis-editor-color-menu-action role=menuitem><span class=oasis-editor-color-menu-action-swatch></span><span>`), _tmpl$3$j = /* @__PURE__ */ template(`<div class=oasis-editor-color-menu-section><div class=oasis-editor-color-menu-heading></div><div class=oasis-editor-color-theme-grid>`), _tmpl$4$d = /* @__PURE__ */ template(`<div class=oasis-editor-color-menu-section><div class=oasis-editor-color-menu-heading></div><div class=oasis-editor-color-standard-grid>`), _tmpl$5$b = /* @__PURE__ */ template(`<button type=button class=oasis-editor-color-menu-action role=menuitem><span class="oasis-editor-color-menu-action-swatch oasis-editor-color-menu-more-swatch"></span><span>`), _tmpl$6$5 = /* @__PURE__ */ template(`<input type=color class=oasis-editor-color-custom-input>`), _tmpl$7$2 = /* @__PURE__ */ template(`<span class=oasis-editor-color-split-icon><i></i><span class=oasis-editor-color-split-indicator>`), _tmpl$8$1 = /* @__PURE__ */ template(`<i data-lucide=slash>`), _tmpl$9 = /* @__PURE__ */ template(`<div class=oasis-editor-color-theme-column>`), _tmpl$0 = /* @__PURE__ */ template(`<button type=button class=oasis-editor-color-swatch>`);
+var _tmpl$$F = /* @__PURE__ */ template(`<i data-lucide=type>`), _tmpl$2$t = /* @__PURE__ */ template(`<button type=button class=oasis-editor-color-menu-action role=menuitem><span class=oasis-editor-color-menu-action-swatch></span><span>`), _tmpl$3$j = /* @__PURE__ */ template(`<div class=oasis-editor-color-menu-section><div class=oasis-editor-color-menu-heading></div><div class=oasis-editor-color-theme-grid>`), _tmpl$4$e = /* @__PURE__ */ template(`<div class=oasis-editor-color-menu-section><div class=oasis-editor-color-menu-heading></div><div class=oasis-editor-color-standard-grid>`), _tmpl$5$b = /* @__PURE__ */ template(`<button type=button class=oasis-editor-color-menu-action role=menuitem><span class="oasis-editor-color-menu-action-swatch oasis-editor-color-menu-more-swatch"></span><span>`), _tmpl$6$5 = /* @__PURE__ */ template(`<input type=color class=oasis-editor-color-custom-input>`), _tmpl$7$2 = /* @__PURE__ */ template(`<span class=oasis-editor-color-split-icon><i></i><span class=oasis-editor-color-split-indicator>`), _tmpl$8$1 = /* @__PURE__ */ template(`<i data-lucide=slash>`), _tmpl$9 = /* @__PURE__ */ template(`<div class=oasis-editor-color-theme-column>`), _tmpl$0 = /* @__PURE__ */ template(`<button type=button class=oasis-editor-color-swatch>`);
 const normalizeColor = (value) => (value == null ? void 0 : value.trim().toLowerCase()) ?? "";
 function ColorPicker(props) {
   const [isOpen, setIsOpen] = createSignal(false);
@@ -16743,7 +17274,7 @@ function ColorPicker(props) {
         }));
         return _el$5;
       })(), (() => {
-        var _el$8 = _tmpl$4$d(), _el$9 = _el$8.firstChild, _el$0 = _el$9.nextSibling;
+        var _el$8 = _tmpl$4$e(), _el$9 = _el$8.firstChild, _el$0 = _el$9.nextSibling;
         insert(_el$9, () => props.standardColorsLabel);
         insert(_el$0, createComponent(For, {
           get each() {
@@ -16808,7 +17339,7 @@ function ColorPicker(props) {
   });
 }
 delegateEvents(["click", "input"]);
-var _tmpl$$E = /* @__PURE__ */ template(`<div class=oasis-editor-table-grid-picker-status>`), _tmpl$2$s = /* @__PURE__ */ template(`<div class=oasis-editor-table-grid-picker-grid>`), _tmpl$3$i = /* @__PURE__ */ template(`<div class=oasis-editor-toolbar-dropdown>`), _tmpl$4$c = /* @__PURE__ */ template(`<button type=button class=oasis-editor-tool-button><i>`), _tmpl$5$a = /* @__PURE__ */ template(`<button type=button class=oasis-editor-table-grid-picker-cell>`);
+var _tmpl$$E = /* @__PURE__ */ template(`<div class=oasis-editor-table-grid-picker-status>`), _tmpl$2$s = /* @__PURE__ */ template(`<div class=oasis-editor-table-grid-picker-grid>`), _tmpl$3$i = /* @__PURE__ */ template(`<div class=oasis-editor-toolbar-dropdown>`), _tmpl$4$d = /* @__PURE__ */ template(`<button type=button class=oasis-editor-tool-button><i>`), _tmpl$5$a = /* @__PURE__ */ template(`<button type=button class=oasis-editor-table-grid-picker-cell>`);
 function GridPicker(props) {
   const t = useI18n();
   const [isOpen, setIsOpen] = createSignal(false);
@@ -16895,7 +17426,7 @@ function GridPicker(props) {
         col: 0
       }),
       trigger: (api) => (() => {
-        var _el$4 = _tmpl$4$c(), _el$5 = _el$4.firstChild;
+        var _el$4 = _tmpl$4$d(), _el$5 = _el$4.firstChild;
         _el$4.$$click = () => api.toggle();
         use((el) => api.ref(el), _el$4);
         createRenderEffect((_p$) => {
@@ -17021,7 +17552,7 @@ const DEFAULT_PALETTE = {
   standardColors: STANDARD_COLORS,
   allowCustom: true
 };
-var _tmpl$$D = /* @__PURE__ */ template(`<button type=button class=oasis-editor-style-gallery-card role=option><span>`), _tmpl$2$r = /* @__PURE__ */ template(`<div class=oasis-editor-style-gallery-grid>`), _tmpl$3$h = /* @__PURE__ */ template(`<div class=oasis-editor-style-gallery><div class=oasis-editor-style-gallery-ribbon><div class=oasis-editor-style-gallery-strip role=listbox></div><button type=button class=oasis-editor-style-gallery-expand aria-haspopup=listbox><i data-lucide=chevron-down>`), _tmpl$4$b = /* @__PURE__ */ template(`<option>`);
+var _tmpl$$D = /* @__PURE__ */ template(`<button type=button class=oasis-editor-style-gallery-card role=option><span>`), _tmpl$2$r = /* @__PURE__ */ template(`<div class=oasis-editor-style-gallery-grid>`), _tmpl$3$h = /* @__PURE__ */ template(`<div class=oasis-editor-style-gallery><div class=oasis-editor-style-gallery-ribbon><div class=oasis-editor-style-gallery-strip role=listbox></div><button type=button class=oasis-editor-style-gallery-expand aria-haspopup=listbox><i data-lucide=chevron-down>`), _tmpl$4$c = /* @__PURE__ */ template(`<option>`);
 function getQuickStyles(styles) {
   const applicable = styles.filter((style2) => style2.type !== "table" && (!style2.semiHidden || style2.unhideWhenUsed && style2.isUsed));
   const hasQuickStyles = applicable.some((style2) => style2.qFormat === true);
@@ -17156,7 +17687,7 @@ function StyleGallery(props) {
               return styles();
             },
             children: (style2) => (() => {
-              var _el$8 = _tmpl$4$b();
+              var _el$8 = _tmpl$4$c();
               insert(_el$8, () => style2.name);
               createRenderEffect(() => _el$8.value = style2.id);
               return _el$8;
@@ -20601,6 +21132,8 @@ function drawBorderBox(ctx, left, top, width, height, borders) {
   drawEdge(ctx, borders.right, right, top, right, bottom);
   drawEdge(ctx, borders.bottom, left, bottom, right, bottom);
   drawEdge(ctx, borders.left, left, top, left, bottom);
+  drawEdge(ctx, borders.topLeftToBottomRight, left, top, right, bottom);
+  drawEdge(ctx, borders.topRightToBottomLeft, right, top, left, bottom);
 }
 const __vite_import_meta_env__ = { "DEV": false };
 function drawVerticalCell(ctx, cell, state, pageIndex, onUpdate, painters) {
@@ -20675,6 +21208,20 @@ function drawTable(ctx, table, tableSegment, state, originX, originY, contentWid
       cell.height,
       cell.borders
     );
+    if (cell.revision) {
+      const color = cell.revision.type === "insert" ? "#059669" : cell.revision.type === "delete" ? "#dc2626" : "#d97706";
+      ctx.save();
+      ctx.strokeStyle = color;
+      ctx.lineWidth = 2;
+      ctx.setLineDash([5, 3]);
+      ctx.strokeRect(
+        cell.left + 1,
+        cell.top + 1,
+        cell.width - 2,
+        cell.height - 2
+      );
+      ctx.restore();
+    }
     if (cell.verticalMode === "horizontal") {
       for (const paragraphLayout of cell.paragraphs) {
         drawParagraph(
@@ -20770,6 +21317,7 @@ function drawParagraphDecorations(ctx, paragraphStyle, lines, originX, contentTo
   }
 }
 function renderBlockList(ctx, state, blocks, originX, originY, contentWidth, pageIndex, onUpdate, pageSettings) {
+  var _a;
   let cursorY = originY;
   for (const block of blocks) {
     if (block.sourceBlock.type === "paragraph" && block.layout) {
@@ -20865,6 +21413,37 @@ function renderBlockList(ctx, state, blocks, originX, originY, contentWidth, pag
         });
       }
     } else if (block.sourceBlock.type === "table") {
+      const floating = (_a = block.sourceBlock.style) == null ? void 0 : _a.floating;
+      if (floating && pageSettings) {
+        const width = resolveCanvasTableWidth(block.sourceBlock, contentWidth);
+        const rect = resolveFloatingTableRect({
+          floating,
+          pageSettings,
+          contentLeft: originX,
+          contentTop: originY,
+          contentWidth,
+          anchorTop: cursorY,
+          width,
+          height: block.floatingTableHeight ?? 1,
+          pageIndex
+        });
+        rect.y += block.floatingTableOffsetY ?? 0;
+        drawTable(
+          ctx,
+          block.sourceBlock,
+          void 0,
+          state,
+          rect.x,
+          rect.y,
+          contentWidth,
+          rect.height,
+          pageIndex,
+          onUpdate,
+          canvasBlockPainters
+        );
+        cursorY += Math.max(0, block.estimatedHeight);
+        continue;
+      }
       drawTable(
         ctx,
         block.sourceBlock,
@@ -21220,7 +21799,7 @@ function createCanvasPageRenderer(options) {
     }
   };
 }
-var _tmpl$$v = /* @__PURE__ */ template(`<div class="oasis-editor-paper-stack oasis-editor-canvas-stack"style=position:relative>`), _tmpl$2$m = /* @__PURE__ */ template(`<div class=oasis-editor-canvas-page-slot style=position:relative>`), _tmpl$3$f = /* @__PURE__ */ template(`<div class=oasis-editor-paper data-renderer=canvas data-testid=editor-page style=position:relative;z-index:1><canvas>`);
+var _tmpl$$v = /* @__PURE__ */ template(`<div class="oasis-editor-paper-stack oasis-editor-canvas-stack"style=position:relative>`), _tmpl$2$m = /* @__PURE__ */ template(`<div class=oasis-editor-canvas-page-slot style=position:relative>`), _tmpl$3$f = /* @__PURE__ */ template(`<div class=oasis-editor-paper data-renderer=canvas data-testid=editor-page style=position:relative;z-index:1><canvas>`), _tmpl$4$b = /* @__PURE__ */ template(`<div class=oasis-editor-table-revision-hit style=position:absolute;pointer-events:auto;background:transparent>`);
 const canvasTextMeasurer = {
   composeMeasuredParagraphLines: (options) => domTextMeasurer.composeMeasuredParagraphLines(options),
   resolveRenderedLineHeightPx: (styles, lineHeightMultiple) => domTextMeasurer.resolveRenderedLineHeightPx(styles, lineHeightMultiple)
@@ -21332,6 +21911,12 @@ function CanvasEditorSurface(props) {
             },
             get onSurfaceDblClick() {
               return props.onSurfaceDblClick;
+            },
+            get onRevisionMouseEnter() {
+              return props.onRevisionMouseEnter;
+            },
+            get onRevisionMouseLeave() {
+              return props.onRevisionMouseLeave;
             }
           }), null);
           return _el$2;
@@ -21348,6 +21933,57 @@ function CanvasPage(props) {
     getPage: () => props.page,
     getState: () => props.state
   });
+  const revisionCells = createMemo(() => {
+    var _a;
+    const result = [];
+    let cursorY = props.page.bodyTop ?? props.page.pageSettings.margins.top;
+    const columns = getPageColumnRects(props.page.pageSettings);
+    for (const block of props.page.blocks) {
+      if (block.sourceBlock.type === "table") {
+        const column = columns[block.columnIndex ?? 0] ?? columns[0];
+        const sourceTable = block.tableSegment ? buildSegmentTable(block.sourceBlock, block.tableSegment) : block.sourceBlock;
+        let originX = column.left;
+        let originY = cursorY;
+        const floating = (_a = sourceTable.style) == null ? void 0 : _a.floating;
+        if (floating) {
+          const rect = resolveFloatingTableRect({
+            floating,
+            pageSettings: props.page.pageSettings,
+            contentLeft: column.left,
+            contentTop: props.page.bodyTop ?? props.page.pageSettings.margins.top,
+            contentWidth: column.width,
+            anchorTop: cursorY,
+            width: resolveCanvasTableWidth(sourceTable, column.width),
+            height: block.floatingTableHeight ?? 1,
+            pageIndex: props.page.index
+          });
+          originX = rect.x;
+          originY = rect.y + (block.floatingTableOffsetY ?? 0);
+        }
+        const layout = buildCanvasTableLayout({
+          table: sourceTable,
+          state: props.state,
+          pageIndex: props.page.index,
+          originX,
+          originY,
+          contentWidth: column.width,
+          estimatedHeight: block.floatingTableHeight ?? block.estimatedHeight
+        });
+        for (const cell of layout.cells) {
+          if (!cell.revision) continue;
+          result.push({
+            id: cell.revision.id,
+            left: cell.left,
+            top: cell.top,
+            width: cell.width,
+            height: cell.height
+          });
+        }
+      }
+      cursorY += Math.max(0, block.estimatedHeight);
+    }
+    return result;
+  });
   createEffect(() => {
     props.page;
     props.state.document;
@@ -21381,6 +22017,36 @@ function CanvasPage(props) {
     addEventListener(_el$3, "mousedown", props.onSurfaceMouseDown, true);
     var _ref$ = canvasRef;
     typeof _ref$ === "function" ? use(_ref$, _el$4) : canvasRef = _el$4;
+    insert(_el$3, createComponent(For, {
+      get each() {
+        return revisionCells();
+      },
+      children: (revision) => (() => {
+        var _el$5 = _tmpl$4$b();
+        addEventListener(_el$5, "mousedown", props.onSurfaceMouseDown, true);
+        _el$5.addEventListener("mouseleave", (event) => {
+          var _a;
+          return (_a = props.onRevisionMouseLeave) == null ? void 0 : _a.call(props, revision.id, event);
+        });
+        _el$5.addEventListener("mouseenter", (event) => props.onRevisionMouseEnter(revision.id, event));
+        createRenderEffect((_p$) => {
+          var _v$4 = revision.id, _v$5 = `${revision.left}px`, _v$6 = `${revision.top}px`, _v$7 = `${revision.width}px`, _v$8 = `${revision.height}px`;
+          _v$4 !== _p$.e && setAttribute(_el$5, "data-revision-id", _p$.e = _v$4);
+          _v$5 !== _p$.t && setStyleProperty(_el$5, "left", _p$.t = _v$5);
+          _v$6 !== _p$.a && setStyleProperty(_el$5, "top", _p$.a = _v$6);
+          _v$7 !== _p$.o && setStyleProperty(_el$5, "width", _p$.o = _v$7);
+          _v$8 !== _p$.i && setStyleProperty(_el$5, "height", _p$.i = _v$8);
+          return _p$;
+        }, {
+          e: void 0,
+          t: void 0,
+          a: void 0,
+          o: void 0,
+          i: void 0
+        });
+        return _el$5;
+      })()
+    }), null);
     createRenderEffect((_p$) => {
       var _v$ = props.index, _v$2 = `${props.page.pageSettings.width}px`, _v$3 = `${props.page.pageSettings.height}px`;
       _v$ !== _p$.e && setAttribute(_el$3, "data-page-index", _p$.e = _v$);
@@ -22075,7 +22741,11 @@ function RevisionOverlay(props) {
       return "Data desconhecida";
     }
   };
-  const label = () => props.box.type === "insert" ? "Inserido por" : "Excluído por";
+  const label = () => {
+    if (props.box.type === "insert") return "Inserido por";
+    if (props.box.type === "delete") return "Excluído por";
+    return "Alterado por";
+  };
   return (() => {
     var _el$ = _tmpl$$r(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$4 = _el$3.firstChild, _el$5 = _el$4.firstChild;
     _el$4.nextSibling;
@@ -32478,23 +33148,508 @@ function parseParagraphStyle$1(paragraphProperties) {
   }
   return emptyOrUndefined(style2);
 }
-function parseConditionalRowStyle(trPr) {
-  if (!trPr) return void 0;
+function parseDocxWidthValue(element) {
+  if (!element) {
+    return void 0;
+  }
+  const type = getAttributeValue(element, "type");
+  const raw = getAttributeValue(element, "w");
+  if (type === "auto") {
+    return "auto";
+  }
+  if (type === "pct") {
+    if (!raw) {
+      return void 0;
+    }
+    const pct = raw.trim().endsWith("%") ? Number.parseFloat(raw) : Number(raw) / 50;
+    return Number.isFinite(pct) ? `${Math.round(pct * 1e4) / 1e4}%` : void 0;
+  }
+  return twipsToPoints(raw);
+}
+function parsePositiveIntegerProperty(parent, localName) {
+  const element = getFirstChildByTagNameNS(parent, WORD_NS, localName);
+  const raw = getAttributeValue(element, "val");
+  const parsed = raw ? Number(raw) : Number.NaN;
+  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : void 0;
+}
+function parseTableConditionalFlags(properties) {
+  const element = getFirstChildByTagNameNS(properties, WORD_NS, "cnfStyle");
+  if (!element) return void 0;
+  const names = [
+    ["firstRow", "firstRow"],
+    ["lastRow", "lastRow"],
+    ["firstColumn", "firstCol"],
+    ["lastColumn", "lastCol"],
+    ["oddVBand", "band1Vert"],
+    ["evenVBand", "band2Vert"],
+    ["oddHBand", "band1Horz"],
+    ["evenHBand", "band2Horz"],
+    ["firstRowFirstColumn", "nwCell"],
+    ["firstRowLastColumn", "neCell"],
+    ["lastRowFirstColumn", "swCell"],
+    ["lastRowLastColumn", "seCell"]
+  ];
+  const rawBits = getAttributeValue(element, "val") ?? "";
+  const flags = {};
+  names.forEach(([attribute, key], index) => {
+    const explicit = getAttributeValue(element, attribute);
+    if (explicit === "1" || explicit === "true" || explicit === "on") {
+      flags[key] = true;
+    } else if (explicit === "0" || explicit === "false" || explicit === "off") {
+      flags[key] = false;
+    } else if (rawBits.length === 12 && rawBits[index] === "1") {
+      flags[key] = true;
+    }
+  });
+  return Object.keys(flags).length > 0 ? flags : void 0;
+}
+function parseRevisionMetadata(element) {
+  const rawDate = getAttributeValue(element, "date");
+  const parsedDate = rawDate ? Date.parse(rawDate) : Number.NaN;
+  return {
+    id: getAttributeValue(element, "id") ?? `revision:${element.localName}`,
+    author: getAttributeValue(element, "author") ?? "Unknown",
+    date: Number.isFinite(parsedDate) ? parsedDate : 0
+  };
+}
+function parseFloatingTableProperties(tblPr) {
+  const tblpPr = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblpPr");
+  if (!tblpPr || !tblpPr.attributes || tblpPr.attributes.length === 0) {
+    return void 0;
+  }
+  const attrs = {};
+  for (let index = 0; index < tblpPr.attributes.length; index += 1) {
+    const attr = tblpPr.attributes.item(index);
+    if ((attr == null ? void 0 : attr.namespaceURI) === WORD_NS || (attr == null ? void 0 : attr.prefix) === "w") {
+      attrs[attr.localName || attr.name.replace(/^w:/, "")] = attr.value;
+    }
+  }
+  const point = (name) => twipsToPoints(attrs[name] ?? null);
+  const horizontalAnchor = attrs.horzAnchor === "margin" || attrs.horzAnchor === "page" || attrs.horzAnchor === "text" ? attrs.horzAnchor : void 0;
+  const verticalAnchor = attrs.vertAnchor === "margin" || attrs.vertAnchor === "page" || attrs.vertAnchor === "text" ? attrs.vertAnchor : void 0;
+  const xAlign = attrs.tblpXSpec === "left" || attrs.tblpXSpec === "center" || attrs.tblpXSpec === "right" || attrs.tblpXSpec === "inside" || attrs.tblpXSpec === "outside" ? attrs.tblpXSpec : void 0;
+  const yAlign = attrs.tblpYSpec === "top" || attrs.tblpYSpec === "center" || attrs.tblpYSpec === "bottom" || attrs.tblpYSpec === "inside" || attrs.tblpYSpec === "outside" ? attrs.tblpYSpec : void 0;
+  return {
+    ...horizontalAnchor ? { horizontalAnchor } : {},
+    ...verticalAnchor ? { verticalAnchor } : {},
+    ...point("tblpX") !== void 0 ? { x: point("tblpX") } : {},
+    ...point("tblpY") !== void 0 ? { y: point("tblpY") } : {},
+    ...xAlign ? { xAlign } : {},
+    ...yAlign ? { yAlign } : {},
+    ...point("topFromText") !== void 0 ? { distanceTop: point("topFromText") } : {},
+    ...point("rightFromText") !== void 0 ? { distanceRight: point("rightFromText") } : {},
+    ...point("bottomFromText") !== void 0 ? { distanceBottom: point("bottomFromText") } : {},
+    ...point("leftFromText") !== void 0 ? { distanceLeft: point("leftFromText") } : {}
+  };
+}
+function parseCellMargins(container) {
+  if (!container) {
+    return void 0;
+  }
+  const edgePt = (edge) => twipsToPoints(
+    getAttributeValue(
+      getFirstChildByTagNameNS(container, WORD_NS, edge),
+      "w"
+    )
+  );
+  const margins = {};
+  const top = edgePt("top");
+  const right = edgePt("right");
+  const bottom = edgePt("bottom");
+  const left = edgePt("left");
+  const start = edgePt("start");
+  const end = edgePt("end");
+  if (top !== void 0) margins.top = top;
+  if (right !== void 0) margins.right = right;
+  if (bottom !== void 0) margins.bottom = bottom;
+  if (left !== void 0) margins.left = left;
+  if (start !== void 0) margins.start = start;
+  if (end !== void 0) margins.end = end;
+  return Object.keys(margins).length > 0 ? margins : void 0;
+}
+function parseTableLayout(tblPr) {
+  const value = getAttributeValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblLayout"),
+    "type"
+  );
+  return value === "fixed" || value === "autofit" ? value : void 0;
+}
+function parseTableStyle(tblPr, tableStyleId) {
   const style2 = {};
-  const trHeight = getFirstChildByTagNameNS(trPr, WORD_NS, "trHeight");
-  if (trHeight) {
-    const height = twipsToPoints(getAttributeValue(trHeight, "val"));
-    if (height !== void 0) style2.height = height;
-    const hRule = getAttributeValue(trHeight, "hRule");
-    if (hRule === "auto" || hRule === "exact" || hRule === "atLeast") {
-      style2.heightRule = hRule;
+  if (tableStyleId) {
+    style2.styleId = tableStyleId;
+  }
+  const altTitle = getAttributeValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblCaption"),
+    "val"
+  );
+  if (altTitle) {
+    style2.altTitle = altTitle;
+  }
+  const altDescription = getAttributeValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblDescription"),
+    "val"
+  );
+  if (altDescription) {
+    style2.altDescription = altDescription;
+  }
+  const width = parseDocxWidthValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblW")
+  );
+  if (width !== void 0) {
+    style2.width = width;
+  }
+  const indentLeft = parseDocxWidthValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblInd")
+  );
+  if (indentLeft !== void 0) {
+    style2.indentLeft = indentLeft;
+  }
+  const jc = getAttributeValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "jc"),
+    "val"
+  );
+  if (jc === "left" || jc === "center" || jc === "right") {
+    style2.align = jc;
+  }
+  const layout = parseTableLayout(tblPr);
+  if (layout) {
+    style2.layout = layout;
+  }
+  const cellSpacing = parseDocxWidthValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblCellSpacing")
+  );
+  if (cellSpacing !== void 0) {
+    style2.cellSpacing = cellSpacing;
+  }
+  const borders = parseDocxTableBorders(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblBorders")
+  );
+  if (Object.keys(borders).length > 0) style2.borders = borders;
+  const defaultCellMargins = parseCellMargins(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblCellMar")
+  );
+  if (defaultCellMargins) {
+    style2.defaultCellMargins = defaultCellMargins;
+  }
+  const bidiVisual = tblPr ? parseOnOffProperty(tblPr, "bidiVisual") : void 0;
+  if (bidiVisual !== void 0) {
+    style2.bidiVisual = bidiVisual;
+  }
+  const tblOverlap = getAttributeValue(
+    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblOverlap"),
+    "val"
+  );
+  if (tblOverlap === "overlap" || tblOverlap === "never") {
+    style2.tblOverlap = tblOverlap;
+  }
+  const floating = parseFloatingTableProperties(tblPr);
+  if (floating) {
+    style2.floating = floating;
+  }
+  const rowBandSize = parsePositiveIntegerProperty(
+    tblPr,
+    "tblStyleRowBandSize"
+  );
+  if (rowBandSize !== void 0) style2.rowBandSize = rowBandSize;
+  const colBandSize = parsePositiveIntegerProperty(
+    tblPr,
+    "tblStyleColBandSize"
+  );
+  if (colBandSize !== void 0) style2.colBandSize = colBandSize;
+  const tblLook = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblLook");
+  if (tblLook) {
+    const raw = getAttributeValue(tblLook, "val");
+    const mask = raw ? Number.parseInt(raw, 16) : Number.NaN;
+    const flag = (name, bit, fallback) => {
+      const value = getAttributeValue(tblLook, name);
+      if (value !== null && value !== "") {
+        return value === "1" || value === "true" || value === "on";
+      }
+      return Number.isFinite(mask) ? (mask & bit) !== 0 : fallback;
+    };
+    style2.tblLook = {
+      firstRow: flag("firstRow", 32, true),
+      lastRow: flag("lastRow", 64, false),
+      firstCol: flag("firstColumn", 128, true),
+      lastCol: flag("lastColumn", 256, false),
+      noHBand: flag("noHBand", 512, false),
+      noVBand: flag("noVBand", 1024, false)
+    };
+  }
+  const change = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblPrChange");
+  const previousProperties = getFirstChildByTagNameNS(change, WORD_NS, "tblPr");
+  if (change && previousProperties) {
+    style2.revision = {
+      ...parseRevisionMetadata(change),
+      type: "property",
+      previous: parseTableStyle(previousProperties) ?? {}
+    };
+  }
+  return emptyOrUndefined(style2);
+}
+function parseTableRowStyle(rowProperties) {
+  if (!rowProperties) {
+    return void 0;
+  }
+  const style2 = {};
+  const isHeader = parseOnOffProperty(rowProperties, "tblHeader");
+  if (isHeader !== void 0) style2.isHeader = isHeader;
+  const gridBefore = parsePositiveIntegerProperty(rowProperties, "gridBefore");
+  if (gridBefore !== void 0) {
+    style2.gridBefore = gridBefore;
+  }
+  const gridAfter = parsePositiveIntegerProperty(rowProperties, "gridAfter");
+  if (gridAfter !== void 0) {
+    style2.gridAfter = gridAfter;
+  }
+  const widthBefore = parseDocxWidthValue(
+    getFirstChildByTagNameNS(rowProperties, WORD_NS, "wBefore")
+  );
+  if (widthBefore !== void 0) {
+    style2.widthBefore = widthBefore;
+  }
+  const widthAfter = parseDocxWidthValue(
+    getFirstChildByTagNameNS(rowProperties, WORD_NS, "wAfter")
+  );
+  if (widthAfter !== void 0) {
+    style2.widthAfter = widthAfter;
+  }
+  const trHeight = getFirstChildByTagNameNS(rowProperties, WORD_NS, "trHeight");
+  const height = twipsToPoints(getAttributeValue(trHeight, "val"));
+  if (height !== void 0) {
+    style2.height = height;
+  }
+  const hRule = getAttributeValue(trHeight, "hRule");
+  if (hRule === "auto" || hRule === "exact" || hRule === "atLeast") {
+    style2.heightRule = hRule;
+  }
+  const cellSpacing = parseDocxWidthValue(
+    getFirstChildByTagNameNS(rowProperties, WORD_NS, "tblCellSpacing")
+  );
+  if (cellSpacing !== void 0) {
+    style2.cellSpacing = cellSpacing;
+  }
+  const cantSplit = parseOnOffProperty(rowProperties, "cantSplit");
+  if (cantSplit !== void 0) {
+    style2.cantSplit = cantSplit;
+  }
+  const hidden = parseOnOffProperty(rowProperties, "hidden");
+  if (hidden !== void 0) {
+    style2.hidden = hidden;
+  }
+  const change = getFirstChildByTagNameNS(rowProperties, WORD_NS, "trPrChange");
+  const previousProperties = getFirstChildByTagNameNS(change, WORD_NS, "trPr");
+  if (change && previousProperties) {
+    style2.propertyRevision = {
+      ...parseRevisionMetadata(change),
+      type: "property",
+      previous: parseTableRowStyle(previousProperties) ?? {}
+    };
+  }
+  const inserted = getFirstChildByTagNameNS(rowProperties, WORD_NS, "ins");
+  const deleted = getFirstChildByTagNameNS(rowProperties, WORD_NS, "del");
+  const structural = inserted ?? deleted;
+  if (structural) {
+    style2.revision = {
+      ...parseRevisionMetadata(structural),
+      type: inserted ? "insert" : "delete"
+    };
+  }
+  return emptyOrUndefined(style2);
+}
+function getTableCellColSpan(cellProperties) {
+  if (!cellProperties) {
+    return 1;
+  }
+  const gridSpan = getFirstChildByTagNameNS(
+    cellProperties,
+    WORD_NS,
+    "gridSpan"
+  );
+  const value = getAttributeValue(gridSpan, "val");
+  const parsed = value ? Number(value) : 1;
+  return Number.isFinite(parsed) && parsed > 1 ? Math.floor(parsed) : 1;
+}
+function getTableCellVMerge(cellProperties) {
+  if (!cellProperties) {
+    return void 0;
+  }
+  const vMerge = getFirstChildByTagNameNS(cellProperties, WORD_NS, "vMerge");
+  if (!vMerge) {
+    return void 0;
+  }
+  const value = getAttributeValue(vMerge, "val");
+  return value === "restart" ? "restart" : "continue";
+}
+function parseTableCellVerticalAlign(cellProperties) {
+  if (!cellProperties) {
+    return void 0;
+  }
+  const vAlign = getFirstChildByTagNameNS(cellProperties, WORD_NS, "vAlign");
+  const value = getAttributeValue(vAlign, "val");
+  if (value === "top" || value === "bottom") {
+    return value;
+  }
+  if (value === "center") {
+    return "middle";
+  }
+  return void 0;
+}
+function parseTableCellBorders(cellProperties) {
+  if (!cellProperties) {
+    return {};
+  }
+  return parseDocxBoxBorders(
+    getFirstChildByTagNameNS(cellProperties, WORD_NS, "tcBorders")
+  );
+}
+function parseTableCellStyle(cellProperties, tableDefaultMargins) {
+  if (!cellProperties) {
+    {
+      return void 0;
+    }
+  }
+  const style2 = {
+    ...{},
+    ...{},
+    ...{},
+    ...{},
+    ...{},
+    ...{}
+  };
+  const shading = getFirstChildByTagNameNS(cellProperties, WORD_NS, "shd");
+  const fill = parseShdFill(shading);
+  if (fill) {
+    style2.shading = fill;
+  }
+  const cellWidth = getFirstChildByTagNameNS(cellProperties, WORD_NS, "tcW");
+  const cellWidthType = getAttributeValue(cellWidth, "type");
+  const cellWidthValue = getAttributeValue(cellWidth, "w");
+  if (cellWidthType === "dxa") {
+    const width = twipsToPoints(cellWidthValue);
+    if (width !== void 0) {
+      style2.width = width;
+    }
+  } else if (cellWidthType === "pct" && cellWidthValue) {
+    const pct = Number(cellWidthValue);
+    if (Number.isFinite(pct)) {
+      style2.width = `${Math.round(pct / 50 * 1e4) / 1e4}%`;
+    }
+  }
+  const tcMar = parseCellMargins(
+    getFirstChildByTagNameNS(cellProperties, WORD_NS, "tcMar")
+  );
+  if (tcMar) {
+    if (tcMar.top !== void 0) style2.paddingTop = tcMar.top;
+    if (tcMar.bottom !== void 0) style2.paddingBottom = tcMar.bottom;
+    if (tcMar.left !== void 0) style2.paddingLeft = tcMar.left;
+    if (tcMar.right !== void 0) style2.paddingRight = tcMar.right;
+    if (tcMar.start !== void 0) style2.paddingStart = tcMar.start;
+    if (tcMar.end !== void 0) style2.paddingEnd = tcMar.end;
+  }
+  const verticalAlign = parseTableCellVerticalAlign(cellProperties);
+  if (verticalAlign) {
+    style2.verticalAlign = verticalAlign;
+  }
+  const textDirection = parseTextDirection(
+    getAttributeValue(
+      getFirstChildByTagNameNS(cellProperties, WORD_NS, "textDirection"),
+      "val"
+    )
+  );
+  if (textDirection) {
+    style2.textDirection = textDirection;
+  }
+  const noWrap = parseOnOffProperty(cellProperties, "noWrap");
+  if (noWrap !== void 0) {
+    style2.noWrap = noWrap;
+  }
+  const fitText = parseOnOffProperty(cellProperties, "tcFitText");
+  if (fitText !== void 0) {
+    style2.fitText = fitText;
+  }
+  const hideMark = parseOnOffProperty(cellProperties, "hideMark");
+  if (hideMark !== void 0) {
+    style2.hideMark = hideMark;
+  }
+  const headers = getAttributeValue(
+    getFirstChildByTagNameNS(cellProperties, WORD_NS, "headers"),
+    "val"
+  );
+  if (headers) {
+    style2.headers = headers;
+  }
+  const change = getFirstChildByTagNameNS(
+    cellProperties,
+    WORD_NS,
+    "tcPrChange"
+  );
+  const previousProperties = getFirstChildByTagNameNS(change, WORD_NS, "tcPr");
+  if (change && previousProperties) {
+    style2.propertyRevision = {
+      ...parseRevisionMetadata(change),
+      type: "property",
+      previous: parseTableCellStyle(previousProperties) ?? {}
+    };
+  }
+  const inserted = getFirstChildByTagNameNS(cellProperties, WORD_NS, "cellIns");
+  const deleted = getFirstChildByTagNameNS(cellProperties, WORD_NS, "cellDel");
+  const merged = getFirstChildByTagNameNS(cellProperties, WORD_NS, "cellMerge");
+  const structural = inserted ?? deleted ?? merged;
+  if (structural) {
+    const originalMerge = getAttributeValue(structural, "vMergeOrig");
+    style2.revision = {
+      ...parseRevisionMetadata(structural),
+      type: inserted ? "insert" : deleted ? "delete" : "merge",
+      ...merged && originalMerge ? {
+        previous: {
+          vMerge: originalMerge === "restart" ? "restart" : "continue"
+        }
+      } : {}
+    };
+  }
+  for (const [key, border] of Object.entries(
+    parseTableCellBorders(cellProperties)
+  )) {
+    if (border) {
+      style2[key] = border;
+    }
+  }
+  return emptyOrUndefined(style2);
+}
+function isTableHeaderRow(rowNode) {
+  const rowProperties = getFirstChildByTagNameNS(rowNode, WORD_NS, "trPr");
+  return rowProperties ? parseOnOffProperty(rowProperties, "tblHeader") === true : false;
+}
+function collapseCellAutospacing(paragraphs, flags) {
+  var _a, _b;
+  const styleOf = (paragraph) => paragraph.style ?? (paragraph.style = {});
+  const lastIndex = paragraphs.length - 1;
+  for (let index = 0; index < paragraphs.length; index += 1) {
+    const flag = flags[index];
+    if (!flag) {
+      continue;
+    }
+    if (index === 0 && flag.before) {
+      styleOf(paragraphs[index]).spacingBefore = 0;
+    }
+    if (index === lastIndex && flag.after) {
+      styleOf(paragraphs[index]).spacingAfter = 0;
+    }
+  }
+  for (let index = 0; index < lastIndex; index += 1) {
+    if (!((_a = flags[index]) == null ? void 0 : _a.after) || !((_b = flags[index + 1]) == null ? void 0 : _b.before)) {
+      continue;
+    }
+    const prev = styleOf(paragraphs[index]);
+    const next = styleOf(paragraphs[index + 1]);
+    if ((prev.spacingAfter ?? 0) >= (next.spacingBefore ?? 0)) {
+      next.spacingBefore = 0;
+    } else {
+      prev.spacingAfter = 0;
     }
   }
-  const cantSplit = parseOnOffProperty(trPr, "cantSplit");
-  if (cantSplit !== void 0) style2.cantSplit = cantSplit;
-  const hidden = parseOnOffProperty(trPr, "hidden");
-  if (hidden !== void 0) style2.hidden = hidden;
-  return Object.keys(style2).length > 0 ? style2 : void 0;
 }
 function parseImportedStyles(stylesXml, theme) {
   if (!stylesXml) {
@@ -32566,8 +33721,6 @@ function parseImportedStyles(stylesXml, theme) {
     let tableStyle;
     if (type === "table") {
       const tblPr = getFirstChildByTagNameNS(styleElement, WORD_NS, "tblPr");
-      const tblInd = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblInd");
-      const indentLeft = twipsToPoints(getAttributeValue(tblInd, "w"));
       const parseBandSize = (localName) => {
         const raw = getAttributeValue(
           getFirstChildByTagNameNS(tblPr, WORD_NS, localName),
@@ -32587,6 +33740,10 @@ function parseImportedStyles(stylesXml, theme) {
         const condType = getAttributeValue(tblStylePr, "type");
         if (!condType) continue;
         const tcPr = getFirstChildByTagNameNS(tblStylePr, WORD_NS, "tcPr");
+        const conditionalCellStyle = parseTableCellStyle(tcPr);
+        const conditionalTableStyle = parseTableStyle(
+          getFirstChildByTagNameNS(tblStylePr, WORD_NS, "tblPr")
+        );
         const shd = getFirstChildByTagNameNS(tcPr, WORD_NS, "shd");
         const fill = parseShdFill(shd);
         const condTextStyle = parseRunStyle(
@@ -32601,22 +33758,23 @@ function parseImportedStyles(stylesXml, theme) {
         const condParagraphStyle = parseParagraphStyle$1(
           getFirstChildByTagNameNS(tblStylePr, WORD_NS, "pPr")
         );
-        const condRowStyle = parseConditionalRowStyle(
+        const condRowStyle = parseTableRowStyle(
           getFirstChildByTagNameNS(tblStylePr, WORD_NS, "trPr")
         );
-        if (fill || condTextStyle || condBorders || condParagraphStyle || condRowStyle) {
+        if (fill || condTextStyle || condBorders || condParagraphStyle || condRowStyle || conditionalCellStyle || conditionalTableStyle) {
           conditionalFormats[condType] = {
             ...fill ? { shading: fill } : {},
             ...condTextStyle ? { textStyle: condTextStyle } : {},
             ...condBorders ? { borders: condBorders } : {},
             ...condParagraphStyle ? { paragraphStyle: condParagraphStyle } : {},
-            ...condRowStyle ? { rowStyle: condRowStyle } : {}
+            ...condRowStyle ? { rowStyle: condRowStyle } : {},
+            ...conditionalCellStyle ? { cellStyle: conditionalCellStyle } : {},
+            ...conditionalTableStyle ? { tableStyle: conditionalTableStyle } : {}
           };
         }
       }
       tableStyle = {
-        styleId: id,
-        indentLeft,
+        ...parseTableStyle(tblPr, id) ?? { styleId: id },
         ...rowBandSize !== void 0 ? { rowBandSize } : {},
         ...colBandSize !== void 0 ? { colBandSize } : {},
         ...Object.keys(conditionalFormats).length > 0 ? { conditionalFormats } : {}
@@ -32630,6 +33788,7 @@ function parseImportedStyles(stylesXml, theme) {
       id,
       name,
       type,
+      isDefault: isWordTrue(getAttributeValue(styleElement, "default")),
       basedOn,
       nextStyle,
       qFormat,
@@ -34057,7 +35216,7 @@ async function parseParagraphNodes(paragraphNode, numberingMaps, zip, relsMap, a
     };
   }
   const paragraphStyle = normalizeImportedParagraphStyle(
-    inheritedStyle ? { ...inheritedStyle, ...styleWithListIndent ?? {} } : styleWithListIndent
+    styleWithListIndent
   );
   const dropCapFrame = parseDropCapFrame(paragraphProperties, runs);
   if (dropCapFrame) {
@@ -34101,8 +35260,7 @@ async function parseParagraphNode(paragraphNode, numberingMaps, zip, relsMap, as
     relsMap,
     assets,
     theme,
-    parseNestedBlocks,
-    inheritedStyle
+    parseNestedBlocks
   );
   return parsed.paragraphs[0] ?? createEditorParagraphFromRuns([{ text: "" }]);
 }
@@ -34124,521 +35282,7 @@ function parseTableLook(tblPr) {
     noVBand: attr("noVBand") ?? bit(1024) ?? false
   };
 }
-function resolveCellConditionalKeys(rowIndex, colIndex, rowCount, colCount, look, rowBandSize, colBandSize) {
-  const isFirstRow = look.firstRow && rowIndex === 0;
-  const isLastRow = look.lastRow && rowIndex === rowCount - 1 && rowIndex !== 0;
-  const isFirstCol = look.firstCol && colIndex === 0;
-  const isLastCol = look.lastCol && colIndex === colCount - 1 && colIndex !== 0;
-  const keys = [];
-  if (!look.noHBand && !isFirstRow && !isLastRow) {
-    const bodyRow = rowIndex - (look.firstRow ? 1 : 0);
-    const band = Math.floor(bodyRow / Math.max(1, rowBandSize)) % 2;
-    keys.push(band === 0 ? "band1Horz" : "band2Horz");
-  }
-  if (!look.noVBand && !isFirstCol && !isLastCol) {
-    const bodyCol = colIndex - (look.firstCol ? 1 : 0);
-    const band = Math.floor(bodyCol / Math.max(1, colBandSize)) % 2;
-    keys.push(band === 0 ? "band1Vert" : "band2Vert");
-  }
-  if (isLastCol) keys.push("lastCol");
-  if (isFirstCol) keys.push("firstCol");
-  if (isLastRow) keys.push("lastRow");
-  if (isFirstRow) keys.push("firstRow");
-  if (isFirstRow && isFirstCol) keys.push("nwCell");
-  if (isFirstRow && isLastCol) keys.push("neCell");
-  if (isLastRow && isFirstCol) keys.push("swCell");
-  if (isLastRow && isLastCol) keys.push("seCell");
-  return keys;
-}
-function mergeConditionalFormats(keys, conditionals) {
-  const merged = {};
-  if (!conditionals) {
-    return merged;
-  }
-  for (const key of keys) {
-    const cond = conditionals[key];
-    if (!cond) continue;
-    if (cond.shading) merged.shading = cond.shading;
-    if (cond.textStyle) {
-      merged.textStyle = { ...merged.textStyle, ...cond.textStyle };
-    }
-    if (cond.borders) {
-      merged.borders = { ...merged.borders, ...cond.borders };
-    }
-    if (cond.paragraphStyle) {
-      merged.paragraphStyle = {
-        ...merged.paragraphStyle,
-        ...cond.paragraphStyle
-      };
-    }
-    if (cond.rowStyle) {
-      merged.rowStyle = { ...merged.rowStyle, ...cond.rowStyle };
-    }
-  }
-  return merged;
-}
-function applyConditionalTextStyle(paragraphs, textStyle) {
-  if (!textStyle || Object.keys(textStyle).length === 0) {
-    return;
-  }
-  for (const paragraph of paragraphs) {
-    for (const run of paragraph.runs) {
-      run.styles = { ...textStyle, ...run.styles };
-    }
-  }
-}
-function tableStyleParagraphInheritance(tableStylePPr, paragraphStyleId, styles) {
-  if (!tableStylePPr) {
-    return void 0;
-  }
-  const effectiveStyleId = paragraphStyleId ?? resolveDefaultParagraphStyleId(styles);
-  const paragraphStyleDelta = resolveNamedParagraphStyle(
-    effectiveStyleId,
-    styles
-  );
-  const definedByParagraphStyle = new Set(Object.keys(paragraphStyleDelta));
-  const filtered = {};
-  for (const [key, value] of Object.entries(tableStylePPr)) {
-    if (!definedByParagraphStyle.has(key)) {
-      filtered[key] = value;
-    }
-  }
-  return emptyOrUndefined(filtered);
-}
-function parseDocxWidthValue(element) {
-  if (!element) {
-    return void 0;
-  }
-  const type = getAttributeValue(element, "type");
-  const raw = getAttributeValue(element, "w");
-  if (type === "auto") {
-    return "auto";
-  }
-  if (type === "pct") {
-    if (!raw) {
-      return void 0;
-    }
-    const pct = raw.trim().endsWith("%") ? Number.parseFloat(raw) : Number(raw) / 50;
-    return Number.isFinite(pct) ? `${Math.round(pct * 1e4) / 1e4}%` : void 0;
-  }
-  return twipsToPoints(raw);
-}
-function parsePositiveIntegerProperty(parent, localName) {
-  const element = getFirstChildByTagNameNS(parent, WORD_NS, localName);
-  const raw = getAttributeValue(element, "val");
-  const parsed = raw ? Number(raw) : Number.NaN;
-  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : void 0;
-}
-function serializeChildXml(parent, localNames) {
-  if (!parent) {
-    return void 0;
-  }
-  const names = new Set(localNames);
-  const serializer = new XMLSerializer();
-  const result = [];
-  const children2 = parent.childNodes;
-  for (let index = 0; index < children2.length; index += 1) {
-    const node = children2[index];
-    if ((node == null ? void 0 : node.nodeType) === node.ELEMENT_NODE && node.namespaceURI === WORD_NS && names.has(node.localName ?? "")) {
-      result.push(serializer.serializeToString(node));
-    }
-  }
-  return result.length > 0 ? result : void 0;
-}
-function parseFloatingTableProperties(tblPr) {
-  const tblpPr = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblpPr");
-  if (!tblpPr || !tblpPr.attributes || tblpPr.attributes.length === 0) {
-    return void 0;
-  }
-  const floating = {};
-  for (let index = 0; index < tblpPr.attributes.length; index += 1) {
-    const attr = tblpPr.attributes.item(index);
-    if ((attr == null ? void 0 : attr.namespaceURI) === WORD_NS || (attr == null ? void 0 : attr.prefix) === "w") {
-      floating[attr.localName || attr.name.replace(/^w:/, "")] = attr.value;
-    }
-  }
-  return Object.keys(floating).length > 0 ? floating : void 0;
-}
-function parseCellMargins(container) {
-  if (!container) {
-    return void 0;
-  }
-  const edgePt = (edge) => twipsToPoints(
-    getAttributeValue(getFirstChildByTagNameNS(container, WORD_NS, edge), "w")
-  );
-  const margins = {};
-  const top = edgePt("top");
-  const right = edgePt("right");
-  const bottom = edgePt("bottom");
-  const left = edgePt("left");
-  const start = edgePt("start");
-  const end = edgePt("end");
-  if (top !== void 0) margins.top = top;
-  if (right !== void 0) margins.right = right;
-  if (bottom !== void 0) margins.bottom = bottom;
-  if (left !== void 0) margins.left = left;
-  if (start !== void 0) margins.start = start;
-  if (end !== void 0) margins.end = end;
-  return Object.keys(margins).length > 0 ? margins : void 0;
-}
-function parseTableLayout(tblPr) {
-  const value = getAttributeValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblLayout"),
-    "type"
-  );
-  return value === "fixed" || value === "autofit" ? value : void 0;
-}
-function parseTableStyle(tblPr, tableStyleId) {
-  const style2 = {};
-  if (tableStyleId) {
-    style2.styleId = tableStyleId;
-  }
-  const altTitle = getAttributeValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblCaption"),
-    "val"
-  );
-  if (altTitle) {
-    style2.altTitle = altTitle;
-  }
-  const altDescription = getAttributeValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblDescription"),
-    "val"
-  );
-  if (altDescription) {
-    style2.altDescription = altDescription;
-  }
-  const width = parseDocxWidthValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblW")
-  );
-  if (width !== void 0) {
-    style2.width = width;
-  }
-  const indentLeft = parseDocxWidthValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblInd")
-  );
-  if (indentLeft !== void 0) {
-    style2.indentLeft = indentLeft;
-  }
-  const jc = getAttributeValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "jc"),
-    "val"
-  );
-  if (jc === "left" || jc === "center" || jc === "right") {
-    style2.align = jc;
-  }
-  const layout = parseTableLayout(tblPr);
-  if (layout) {
-    style2.layout = layout;
-  }
-  const cellSpacing = parseDocxWidthValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblCellSpacing")
-  );
-  if (cellSpacing !== void 0) {
-    style2.cellSpacing = cellSpacing;
-  }
-  const defaultCellMargins = parseCellMargins(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblCellMar")
-  );
-  if (defaultCellMargins) {
-    style2.defaultCellMargins = defaultCellMargins;
-  }
-  const bidiVisual = tblPr ? parseOnOffProperty(tblPr, "bidiVisual") : void 0;
-  if (bidiVisual !== void 0) {
-    style2.bidiVisual = bidiVisual;
-  }
-  const tblOverlap = getAttributeValue(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblOverlap"),
-    "val"
-  );
-  if (tblOverlap) {
-    style2.tblOverlap = tblOverlap;
-  }
-  const floating = parseFloatingTableProperties(tblPr);
-  if (floating) {
-    style2.floating = floating;
-  }
-  const revisionXml = serializeChildXml(tblPr, ["tblPrChange"]);
-  if (revisionXml) {
-    style2.revisionXml = revisionXml;
-  }
-  return emptyOrUndefined(style2);
-}
-function parseTableRowStyle(rowProperties) {
-  if (!rowProperties) {
-    return void 0;
-  }
-  const style2 = {};
-  const gridBefore = parsePositiveIntegerProperty(rowProperties, "gridBefore");
-  if (gridBefore !== void 0) {
-    style2.gridBefore = gridBefore;
-  }
-  const gridAfter = parsePositiveIntegerProperty(rowProperties, "gridAfter");
-  if (gridAfter !== void 0) {
-    style2.gridAfter = gridAfter;
-  }
-  const widthBefore = parseDocxWidthValue(
-    getFirstChildByTagNameNS(rowProperties, WORD_NS, "wBefore")
-  );
-  if (widthBefore !== void 0) {
-    style2.widthBefore = widthBefore;
-  }
-  const widthAfter = parseDocxWidthValue(
-    getFirstChildByTagNameNS(rowProperties, WORD_NS, "wAfter")
-  );
-  if (widthAfter !== void 0) {
-    style2.widthAfter = widthAfter;
-  }
-  const trHeight = getFirstChildByTagNameNS(rowProperties, WORD_NS, "trHeight");
-  const height = twipsToPoints(getAttributeValue(trHeight, "val"));
-  if (height !== void 0) {
-    style2.height = height;
-  }
-  const hRule = getAttributeValue(trHeight, "hRule");
-  if (hRule === "auto" || hRule === "exact" || hRule === "atLeast") {
-    style2.heightRule = hRule;
-  }
-  const cellSpacing = parseDocxWidthValue(
-    getFirstChildByTagNameNS(rowProperties, WORD_NS, "tblCellSpacing")
-  );
-  if (cellSpacing !== void 0) {
-    style2.cellSpacing = cellSpacing;
-  }
-  const cantSplit = parseOnOffProperty(rowProperties, "cantSplit");
-  if (cantSplit !== void 0) {
-    style2.cantSplit = cantSplit;
-  }
-  const hidden = parseOnOffProperty(rowProperties, "hidden");
-  if (hidden !== void 0) {
-    style2.hidden = hidden;
-  }
-  const revisionXml = serializeChildXml(rowProperties, [
-    "trPrChange",
-    "ins",
-    "del"
-  ]);
-  if (revisionXml) {
-    style2.revisionXml = revisionXml;
-  }
-  return emptyOrUndefined(style2);
-}
-function getTableCellColSpan(cellProperties) {
-  if (!cellProperties) {
-    return 1;
-  }
-  const gridSpan = getFirstChildByTagNameNS(
-    cellProperties,
-    WORD_NS,
-    "gridSpan"
-  );
-  const value = getAttributeValue(gridSpan, "val");
-  const parsed = value ? Number(value) : 1;
-  return Number.isFinite(parsed) && parsed > 1 ? Math.floor(parsed) : 1;
-}
-function getTableCellVMerge(cellProperties) {
-  if (!cellProperties) {
-    return void 0;
-  }
-  const vMerge = getFirstChildByTagNameNS(cellProperties, WORD_NS, "vMerge");
-  if (!vMerge) {
-    return void 0;
-  }
-  const value = getAttributeValue(vMerge, "val");
-  return value === "restart" ? "restart" : "continue";
-}
-function parseTableCellVerticalAlign(cellProperties) {
-  if (!cellProperties) {
-    return void 0;
-  }
-  const vAlign = getFirstChildByTagNameNS(cellProperties, WORD_NS, "vAlign");
-  const value = getAttributeValue(vAlign, "val");
-  if (value === "top" || value === "bottom") {
-    return value;
-  }
-  if (value === "center") {
-    return "middle";
-  }
-  return void 0;
-}
-function parseTableCellBorders(cellProperties) {
-  if (!cellProperties) {
-    return {};
-  }
-  return parseDocxBoxBorders(
-    getFirstChildByTagNameNS(cellProperties, WORD_NS, "tcBorders")
-  );
-}
-function parseTableCellStyle(cellProperties, tableDefaultMargins) {
-  if (!cellProperties) {
-    if (!tableDefaultMargins) {
-      return void 0;
-    }
-    return emptyOrUndefined({
-      paddingTop: tableDefaultMargins.top,
-      paddingRight: tableDefaultMargins.right,
-      paddingBottom: tableDefaultMargins.bottom,
-      paddingLeft: tableDefaultMargins.left,
-      paddingStart: tableDefaultMargins.start,
-      paddingEnd: tableDefaultMargins.end
-    });
-  }
-  const style2 = {
-    ...(tableDefaultMargins == null ? void 0 : tableDefaultMargins.top) !== void 0 ? { paddingTop: tableDefaultMargins.top } : {},
-    ...(tableDefaultMargins == null ? void 0 : tableDefaultMargins.right) !== void 0 ? { paddingRight: tableDefaultMargins.right } : {},
-    ...(tableDefaultMargins == null ? void 0 : tableDefaultMargins.bottom) !== void 0 ? { paddingBottom: tableDefaultMargins.bottom } : {},
-    ...(tableDefaultMargins == null ? void 0 : tableDefaultMargins.left) !== void 0 ? { paddingLeft: tableDefaultMargins.left } : {},
-    ...(tableDefaultMargins == null ? void 0 : tableDefaultMargins.start) !== void 0 ? { paddingStart: tableDefaultMargins.start } : {},
-    ...(tableDefaultMargins == null ? void 0 : tableDefaultMargins.end) !== void 0 ? { paddingEnd: tableDefaultMargins.end } : {}
-  };
-  const shading = getFirstChildByTagNameNS(cellProperties, WORD_NS, "shd");
-  const fill = parseShdFill(shading);
-  if (fill) {
-    style2.shading = fill;
-  }
-  const cellWidth = getFirstChildByTagNameNS(cellProperties, WORD_NS, "tcW");
-  const cellWidthType = getAttributeValue(cellWidth, "type");
-  const cellWidthValue = getAttributeValue(cellWidth, "w");
-  if (cellWidthType === "dxa") {
-    const width = twipsToPoints(cellWidthValue);
-    if (width !== void 0) {
-      style2.width = width;
-    }
-  } else if (cellWidthType === "pct" && cellWidthValue) {
-    const pct = Number(cellWidthValue);
-    if (Number.isFinite(pct)) {
-      style2.width = `${Math.round(pct / 50 * 1e4) / 1e4}%`;
-    }
-  }
-  const tcMar = parseCellMargins(
-    getFirstChildByTagNameNS(cellProperties, WORD_NS, "tcMar")
-  );
-  if (tcMar) {
-    if (tcMar.top !== void 0) style2.paddingTop = tcMar.top;
-    if (tcMar.bottom !== void 0) style2.paddingBottom = tcMar.bottom;
-    if (tcMar.left !== void 0) style2.paddingLeft = tcMar.left;
-    if (tcMar.right !== void 0) style2.paddingRight = tcMar.right;
-    if (tcMar.start !== void 0) style2.paddingStart = tcMar.start;
-    if (tcMar.end !== void 0) style2.paddingEnd = tcMar.end;
-  }
-  const verticalAlign = parseTableCellVerticalAlign(cellProperties);
-  if (verticalAlign) {
-    style2.verticalAlign = verticalAlign;
-  }
-  const textDirection = parseTextDirection(
-    getAttributeValue(
-      getFirstChildByTagNameNS(cellProperties, WORD_NS, "textDirection"),
-      "val"
-    )
-  );
-  if (textDirection) {
-    style2.textDirection = textDirection;
-  }
-  const noWrap = parseOnOffProperty(cellProperties, "noWrap");
-  if (noWrap !== void 0) {
-    style2.noWrap = noWrap;
-  }
-  const fitText = parseOnOffProperty(cellProperties, "tcFitText");
-  if (fitText !== void 0) {
-    style2.fitText = fitText;
-  }
-  const hideMark = parseOnOffProperty(cellProperties, "hideMark");
-  if (hideMark !== void 0) {
-    style2.hideMark = hideMark;
-  }
-  const headers = getAttributeValue(
-    getFirstChildByTagNameNS(cellProperties, WORD_NS, "headers"),
-    "val"
-  );
-  if (headers) {
-    style2.headers = headers;
-  }
-  const revisionXml = serializeChildXml(cellProperties, [
-    "tcPrChange",
-    "cellIns",
-    "cellDel",
-    "cellMerge"
-  ]);
-  if (revisionXml) {
-    style2.revisionXml = revisionXml;
-  }
-  for (const [key, border] of Object.entries(
-    parseTableCellBorders(cellProperties)
-  )) {
-    if (border) {
-      style2[key] = border;
-    }
-  }
-  return emptyOrUndefined(style2);
-}
-function isTableHeaderRow(rowNode) {
-  const rowProperties = getFirstChildByTagNameNS(rowNode, WORD_NS, "trPr");
-  return rowProperties ? parseOnOffProperty(rowProperties, "tblHeader") === true : false;
-}
-function collapseCellAutospacing(paragraphs, flags) {
-  var _a, _b;
-  const styleOf = (paragraph) => paragraph.style ?? (paragraph.style = {});
-  const lastIndex = paragraphs.length - 1;
-  for (let index = 0; index < paragraphs.length; index += 1) {
-    const flag = flags[index];
-    if (!flag) {
-      continue;
-    }
-    if (index === 0 && flag.before) {
-      styleOf(paragraphs[index]).spacingBefore = 0;
-    }
-    if (index === lastIndex && flag.after) {
-      styleOf(paragraphs[index]).spacingAfter = 0;
-    }
-  }
-  for (let index = 0; index < lastIndex; index += 1) {
-    if (!((_a = flags[index]) == null ? void 0 : _a.after) || !((_b = flags[index + 1]) == null ? void 0 : _b.before)) {
-      continue;
-    }
-    const prev = styleOf(paragraphs[index]);
-    const next = styleOf(paragraphs[index + 1]);
-    if ((prev.spacingAfter ?? 0) >= (next.spacingBefore ?? 0)) {
-      next.spacingBefore = 0;
-    } else {
-      prev.spacingAfter = 0;
-    }
-  }
-}
-function applyTableBordersToRows(rows, tblBorders) {
-  if (Object.keys(tblBorders).length === 0) {
-    return;
-  }
-  const lastRowIndex = rows.length - 1;
-  for (let rowIndex = 0; rowIndex <= lastRowIndex; rowIndex += 1) {
-    const row = rows[rowIndex];
-    const lastColIndex = row.cells.length - 1;
-    for (let colIndex = 0; colIndex <= lastColIndex; colIndex += 1) {
-      const cell = row.cells[colIndex];
-      const style2 = cell.style ?? {};
-      if (rowIndex === 0 && style2.borderTop === void 0 && tblBorders.borderTop) {
-        style2.borderTop = tblBorders.borderTop;
-      }
-      if (rowIndex === lastRowIndex && style2.borderBottom === void 0 && tblBorders.borderBottom) {
-        style2.borderBottom = tblBorders.borderBottom;
-      }
-      if (colIndex === 0 && style2.borderLeft === void 0 && tblBorders.borderLeft) {
-        style2.borderLeft = tblBorders.borderLeft;
-      }
-      if (colIndex === lastColIndex && style2.borderRight === void 0 && tblBorders.borderRight) {
-        style2.borderRight = tblBorders.borderRight;
-      }
-      if (rowIndex < lastRowIndex && style2.borderBottom === void 0 && tblBorders.borderInsideH) {
-        style2.borderBottom = tblBorders.borderInsideH;
-      }
-      if (colIndex < lastColIndex && style2.borderRight === void 0 && tblBorders.borderInsideV) {
-        style2.borderRight = tblBorders.borderInsideV;
-      }
-      if (Object.keys(style2).length > 0 && cell.style !== style2) {
-        cell.style = style2;
-      }
-    }
-  }
-}
-async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, theme, parseNestedBlocks, styles) {
-  var _a, _b;
+async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, theme, parseNestedBlocks, _styles) {
   const gridCols = [];
   const tblGrid = getFirstChildByTagNameNS(tableNode, WORD_NS, "tblGrid");
   if (tblGrid) {
@@ -34660,39 +35304,14 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
     getFirstChildByTagNameNS(tblPr, WORD_NS, "tblStyle"),
     "val"
   );
-  const inheritedParagraphStyle = tableStyleId && ((_a = styles == null ? void 0 : styles[tableStyleId]) == null ? void 0 : _a.paragraphStyle) ? styles[tableStyleId].paragraphStyle : void 0;
-  const tblBorders = parseDocxTableBorders(
-    getFirstChildByTagNameNS(tblPr, WORD_NS, "tblBorders")
-  );
-  const tableStyleDef = tableStyleId ? (_b = styles == null ? void 0 : styles[tableStyleId]) == null ? void 0 : _b.tableStyle : void 0;
   const directTableStyle = parseTableStyle(tblPr, tableStyleId ?? void 0);
-  const tableDefaultMargins = directTableStyle == null ? void 0 : directTableStyle.defaultCellMargins;
-  const tblConditionals = (tableStyleDef == null ? void 0 : tableStyleDef.conditionalFormats) ?? void 0;
   const look = parseTableLook(tblPr);
-  const rowBandSize = (tableStyleDef == null ? void 0 : tableStyleDef.rowBandSize) ?? 1;
-  const colBandSize = (tableStyleDef == null ? void 0 : tableStyleDef.colBandSize) ?? 1;
   const rowNodes = getChildrenByTagNameNS(tableNode, WORD_NS, "tr");
-  const rowCount = rowNodes.length;
-  const colCount = gridCols.length > 0 ? gridCols.length : rowNodes.reduce(
-    (max, node) => Math.max(max, getChildrenByTagNameNS(node, WORD_NS, "tc").length),
-    0
-  );
   const rows = [];
   for (let rowIndex = 0; rowIndex < rowNodes.length; rowIndex += 1) {
     const rowNode = rowNodes[rowIndex];
     const rowProperties = getFirstChildByTagNameNS(rowNode, WORD_NS, "trPr");
-    const cnfStyle = getFirstChildByTagNameNS(
-      rowProperties,
-      WORD_NS,
-      "cnfStyle"
-    );
-    const explicitRowKeys = [];
-    if (getAttributeValue(cnfStyle, "firstRow") === "1") {
-      explicitRowKeys.push("firstRow");
-    }
-    if (getAttributeValue(cnfStyle, "lastRow") === "1") {
-      explicitRowKeys.push("lastRow");
-    }
+    const rowConditionalStyle = parseTableConditionalFlags(rowProperties);
     const cellNodes = getChildrenByTagNameNS(rowNode, WORD_NS, "tc");
     const cells = [];
     for (let colIndex = 0; colIndex < cellNodes.length; colIndex += 1) {
@@ -34709,19 +35328,6 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
         WORD_NS,
         "p"
       )) {
-        const paragraphStyleId = getAttributeValue(
-          getFirstChildByTagNameNS(
-            getFirstChildByTagNameNS(paragraphNode, WORD_NS, "pPr"),
-            WORD_NS,
-            "pStyle"
-          ),
-          "val"
-        ) ?? void 0;
-        const cellInheritedStyle = tableStyleParagraphInheritance(
-          inheritedParagraphStyle,
-          paragraphStyleId,
-          styles
-        );
         paragraphs.push(
           await parseParagraphNode(
             paragraphNode,
@@ -34730,8 +35336,7 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
             relsMap,
             assets,
             theme,
-            parseNestedBlocks,
-            cellInheritedStyle
+            parseNestedBlocks
           )
         );
         autospacingFlags.push(
@@ -34743,55 +35348,14 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
       collapseCellAutospacing(paragraphs, autospacingFlags);
       const colSpan = getTableCellColSpan(cellProperties);
       const vMerge = getTableCellVMerge(cellProperties);
-      const cellStyle = parseTableCellStyle(cellProperties, tableDefaultMargins);
-      const conditional = mergeConditionalFormats(
-        [
-          ...resolveCellConditionalKeys(
-            rowIndex,
-            colIndex,
-            rowCount,
-            colCount,
-            look,
-            rowBandSize,
-            colBandSize
-          ),
-          ...explicitRowKeys
-        ],
-        tblConditionals
-      );
-      applyConditionalTextStyle(paragraphs, conditional.textStyle);
-      if (conditional.paragraphStyle) {
-        const condPStyle = conditional.paragraphStyle;
-        for (const paragraph of paragraphs) {
-          paragraph.style = { ...condPStyle, ...paragraph.style };
-        }
-      }
+      const cellStyle = parseTableCellStyle(cellProperties);
       const cell = createEditorTableCell(
         paragraphs.length > 0 ? paragraphs : [createEditorParagraphFromRuns([{ text: "" }])],
         colSpan,
         vMerge === "restart" ? { rowSpan: 1, vMerge } : vMerge ? { vMerge } : void 0
       );
-      const mergedStyle = { ...cellStyle ?? {} };
-      const resolvedShading = (cellStyle == null ? void 0 : cellStyle.shading) ?? conditional.shading;
-      if (resolvedShading) {
-        mergedStyle.shading = resolvedShading;
-      }
-      if (conditional.borders) {
-        for (const edge of [
-          "borderTop",
-          "borderRight",
-          "borderBottom",
-          "borderLeft"
-        ]) {
-          const border = conditional.borders[edge];
-          if (mergedStyle[edge] === void 0 && border) {
-            mergedStyle[edge] = border;
-          }
-        }
-      }
-      if (Object.keys(mergedStyle).length > 0) {
-        cell.style = mergedStyle;
-      }
+      if (cellStyle) cell.style = cellStyle;
+      cell.conditionalStyle = parseTableConditionalFlags(cellProperties);
       if (vMerge === "continue") {
         cell.blocks = [];
       }
@@ -34805,33 +35369,13 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
     if (rowStyle) {
       row.style = rowStyle;
     }
-    if (tblConditionals) {
-      const rowKeys = resolveCellConditionalKeys(
-        rowIndex,
-        0,
-        rowCount,
-        Math.max(1, colCount),
-        look,
-        rowBandSize,
-        colBandSize
-      ).filter(
-        (k) => k === "firstRow" || k === "lastRow" || k === "band1Horz" || k === "band2Horz"
-      );
-      const mergedRowConditional = mergeConditionalFormats(
-        [...explicitRowKeys, ...rowKeys],
-        tblConditionals
-      );
-      if (mergedRowConditional.rowStyle) {
-        row.style = { ...mergedRowConditional.rowStyle, ...row.style };
-      }
-    }
+    row.conditionalStyle = rowConditionalStyle;
     const tblPrEx = getFirstChildByTagNameNS(rowNode, WORD_NS, "tblPrEx");
     if (tblPrEx) {
       row.tblPrExXml = new XMLSerializer().serializeToString(tblPrEx);
     }
     rows.push(row);
   }
-  applyTableBordersToRows(rows, tblBorders);
   for (let rowIndex = 0; rowIndex < rows.length; rowIndex += 1) {
     const row = rows[rowIndex];
     for (let cellIndex = 0; cellIndex < row.cells.length; cellIndex += 1) {
@@ -34865,9 +35409,21 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
     table.style = { tblLook: look };
   }
   if (tblGridChangeXml) {
-    table.tblGridChangeXml = new XMLSerializer().serializeToString(
-      tblGridChangeXml
+    const previousGrid = getFirstChildByTagNameNS(
+      tblGridChangeXml,
+      WORD_NS,
+      "tblGrid"
     );
+    const previous = previousGrid ? getChildrenByTagNameNS(previousGrid, WORD_NS, "gridCol").map((gridCol) => twipsToPoints(getAttributeValue(gridCol, "w"))).filter((width) => width !== void 0) : [];
+    const rawDate = getAttributeValue(tblGridChangeXml, "date");
+    const parsedDate = rawDate ? Date.parse(rawDate) : Number.NaN;
+    table.gridRevision = {
+      id: getAttributeValue(tblGridChangeXml, "id") ?? "revision:grid",
+      author: getAttributeValue(tblGridChangeXml, "author") ?? "Unknown",
+      date: Number.isFinite(parsedDate) ? parsedDate : 0,
+      type: "grid",
+      previous
+    };
   }
   return table;
 }
@@ -34972,8 +35528,7 @@ async function parseHeaderFooterXml(xmlContent, numberingMaps, zip, relsMap, ass
           relsMap,
           assets,
           theme,
-          parseNestedBlocks,
-          styles
+          parseNestedBlocks
         )
       );
     }
@@ -35041,8 +35596,7 @@ async function parseDocxNotesXml(kind, xmlContent, numberingMaps, zip, relsMap,
             relsMap,
             assets,
             theme,
-            parseNestedBlocks,
-            styles
+            parseNestedBlocks
           )
         );
       }
@@ -35083,8 +35637,7 @@ async function parseFootnotesXml(xmlContent, numberingMaps, zip, relsMap, assets
     zip,
     relsMap,
     assets,
-    theme,
-    styles
+    theme
   );
   return {
     byDocxId: parsed.byDocxId,
@@ -35101,8 +35654,7 @@ async function parseEndnotesXml(xmlContent, numberingMaps, zip, relsMap, assets,
     zip,
     relsMap,
     assets,
-    theme,
-    styles
+    theme
   );
   return {
     byDocxId: parsed.byDocxId,
@@ -35481,8 +36033,7 @@ async function importDocxToEditorDocument(buffer, options = {}) {
           relsMap,
           assets,
           theme,
-          parseNestedBlocks,
-          importedStyles
+          parseNestedBlocks
         )
       );
       reportBodyProgress();
@@ -35550,8 +36101,7 @@ async function importDocxToEditorDocument(buffer, options = {}) {
         zip,
         partRelsMap,
         assets,
-        theme,
-        importedStyles
+        theme
       );
       applyDocGridLinePitch(
         partBlocks,
@@ -35611,8 +36161,7 @@ async function importDocxToEditorDocument(buffer, options = {}) {
     zip,
     footnotesPartRels,
     assets,
-    theme,
-    importedStyles
+    theme
   );
   if (docSettings.footnoteSettings) {
     parsedFootnotes.footnotes.settings = docSettings.footnoteSettings;
@@ -35627,8 +36176,7 @@ async function importDocxToEditorDocument(buffer, options = {}) {
     zip,
     endnotesPartRels,
     assets,
-    theme,
-    importedStyles
+    theme
   );
   if (docSettings.endnoteSettings) {
     parsedEndnotes.endnotes.settings = docSettings.endnoteSettings;
@@ -35841,7 +36389,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-BcELKms0.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-DVDyiqYf.js", import.meta.url).href,
         import.meta.url
       ),
       {
@@ -40206,7 +40754,7 @@ export {
   createRenderEffect as Z,
   style as _,
   assertNever as a,
-  defaultFontDecoderRegistry as a$,
+  loadFontAsset as a$,
   setStyleProperty as a0,
   memo as a1,
   template as a2,
@@ -40226,24 +40774,24 @@ export {
   getPresetPathSegments as aG,
   projectBlocksLayout as aH,
   buildListLabels as aI,
-  textStyleToFontSizePt as aJ,
-  PX_PER_POINT as aK,
-  DEFAULT_FONT_SIZE_PX as aL,
-  isDoubleUnderlineStyle as aM,
-  isWavyUnderlineStyle as aN,
-  underlineStyleLineWidthPx as aO,
-  underlineStyleDashArray as aP,
-  resolveListLabel as aQ,
-  getListLabelInset as aR,
-  getAlignedListLabelInset as aS,
-  getParagraphBorderInsets as aT,
-  buildSegmentTable as aU,
-  buildCanvasTableLayout as aV,
-  normalizeFamily as aW,
-  ROBOTO_FONT_FILES as aX,
-  loadFontAsset as aY,
-  OFFICE_COMPAT_FONT_FAMILIES as aZ,
-  buildSfnt as a_,
+  getImageFloatingGeometry as aJ,
+  textStyleToFontSizePt as aK,
+  PX_PER_POINT as aL,
+  DEFAULT_FONT_SIZE_PX as aM,
+  isDoubleUnderlineStyle as aN,
+  isWavyUnderlineStyle as aO,
+  underlineStyleLineWidthPx as aP,
+  underlineStyleDashArray as aQ,
+  resolveListLabel as aR,
+  getListLabelInset as aS,
+  getAlignedListLabelInset as aT,
+  getParagraphBorderInsets as aU,
+  buildSegmentTable as aV,
+  buildCanvasTableLayout as aW,
+  resolveCanvasTableWidth as aX,
+  resolveFloatingTableRect as aY,
+  normalizeFamily as aZ,
+  ROBOTO_FONT_FILES as a_,
   className as aa,
   For as ab,
   UNDERLINE_STYLE_OPTIONS as ac,
@@ -40271,109 +40819,112 @@ export {
   getRunFieldChar as ay,
   getRunFieldInstruction as az,
   createEditorStateFromDocument as b,
-  I18nProvider as b$,
-  SfntFontProgram as b0,
-  collectPdfFontFamilies as b1,
-  projectDocumentLayout as b2,
-  getPageContentWidth as b3,
-  getPageHeaderZoneTop as b4,
-  getPageBodyTop as b5,
-  getPageColumnRects as b6,
-  findFootnoteReference as b7,
-  FOOTNOTE_MARKER_GUTTER_PX as b8,
-  resolveImporterForFile as b9,
-  createFootnoteReferenceRun as bA,
-  renumberFootnotes as bB,
-  getFootnoteDisplayMarker as bC,
-  getHeadingLevel as bD,
-  preciseFontModeVersion as bE,
-  isPreciseFontModeEnabled as bF,
-  resolveNamedTextStyle as bG,
-  togglePreciseFontMode as bH,
-  nextFontSizePt as bI,
-  previousFontSizePt as bJ,
-  fontSizePtToPx as bK,
-  createDefaultToolbarPreset as bL,
-  MenuRegistry as bM,
-  createToolbarRegistry as bN,
-  Editor as bO,
-  resolveCommandRef as bP,
-  commandRefName as bQ,
-  createOasisEditorClient as bR,
-  createEditorZoom as bS,
-  startLongTaskObserver as bT,
-  installGlobalReport as bU,
-  applyStoredPreciseFontPreference as bV,
-  getWelcomeSeen as bW,
-  isLocalFontAccessSupported as bX,
-  EDITOR_SCROLL_PADDING_PX as bY,
-  Toolbar as bZ,
-  OasisEditorLoading as b_,
-  getDocumentSectionsCanonical as ba,
-  getDocumentParagraphsCanonical as bb,
-  getDocumentParagraphs as bc,
-  getDocumentPageSettings as bd,
-  getTableCellContentWidthForParagraph as be,
-  on as bf,
-  debounce as bg,
-  unwrap as bh,
-  perfTimer as bi,
-  getRunTextBox as bj,
-  createEditorDocument as bk,
-  resolveResizedDimensions as bl,
-  resolveTextBoxRenderHeight as bm,
-  getToolbarStyleState as bn,
-  getCachedCanvasImage as bo,
-  measureParagraphMinContentWidthPx as bp,
-  getEditableBlocksForZone as bq,
-  findParagraphLocation as br,
-  createSectionBoundaryParagraph as bs,
-  normalizePageSettings as bt,
-  DEFAULT_EDITOR_PAGE_SETTINGS as bu,
-  markStart as bv,
-  markEnd as bw,
-  getParagraphEntries as bx,
-  getParagraphById as by,
-  createEditorFootnote as bz,
+  EDITOR_SCROLL_PADDING_PX as b$,
+  OFFICE_COMPAT_FONT_FAMILIES as b0,
+  buildSfnt as b1,
+  defaultFontDecoderRegistry as b2,
+  SfntFontProgram as b3,
+  collectPdfFontFamilies as b4,
+  projectDocumentLayout as b5,
+  getPageContentWidth as b6,
+  getPageHeaderZoneTop as b7,
+  getPageBodyTop as b8,
+  getPageColumnRects as b9,
+  getParagraphEntries as bA,
+  getParagraphById as bB,
+  createEditorFootnote as bC,
+  createFootnoteReferenceRun as bD,
+  renumberFootnotes as bE,
+  getFootnoteDisplayMarker as bF,
+  getHeadingLevel as bG,
+  preciseFontModeVersion as bH,
+  isPreciseFontModeEnabled as bI,
+  resolveNamedTextStyle as bJ,
+  togglePreciseFontMode as bK,
+  nextFontSizePt as bL,
+  previousFontSizePt as bM,
+  fontSizePtToPx as bN,
+  createDefaultToolbarPreset as bO,
+  MenuRegistry as bP,
+  createToolbarRegistry as bQ,
+  Editor as bR,
+  resolveCommandRef as bS,
+  commandRefName as bT,
+  createOasisEditorClient as bU,
+  createEditorZoom as bV,
+  startLongTaskObserver as bW,
+  installGlobalReport as bX,
+  applyStoredPreciseFontPreference as bY,
+  getWelcomeSeen as bZ,
+  isLocalFontAccessSupported as b_,
+  findFootnoteReference as ba,
+  FOOTNOTE_MARKER_GUTTER_PX as bb,
+  resolveImporterForFile as bc,
+  getDocumentSectionsCanonical as bd,
+  getDocumentParagraphsCanonical as be,
+  getDocumentParagraphs as bf,
+  getDocumentPageSettings as bg,
+  getTableCellContentWidthForParagraph as bh,
+  on as bi,
+  debounce as bj,
+  unwrap as bk,
+  perfTimer as bl,
+  getRunTextBox as bm,
+  createEditorDocument as bn,
+  resolveResizedDimensions as bo,
+  resolveTextBoxRenderHeight as bp,
+  getToolbarStyleState as bq,
+  getCachedCanvasImage as br,
+  measureParagraphMinContentWidthPx as bs,
+  getEditableBlocksForZone as bt,
+  findParagraphLocation as bu,
+  createSectionBoundaryParagraph as bv,
+  normalizePageSettings as bw,
+  DEFAULT_EDITOR_PAGE_SETTINGS as bx,
+  markStart as by,
+  markEnd as bz,
   createSignal as c,
-  createTranslator as c0,
-  createEditorLogger as c1,
-  registerDomStatsSurface as c2,
-  Button as c3,
-  Checkbox as c4,
-  ColorPicker as c5,
-  CommandRegistry as c6,
-  DEFAULT_PALETTE as c7,
-  DialogFooter as c8,
-  FloatingActionButton as c9,
-  mount as cA,
-  registerToolbarRenderer as cB,
-  GridPicker as ca,
-  IconButton as cb,
-  Menu as cc,
-  OASIS_BUILTIN_COMMANDS as cd,
-  OASIS_MENU_ITEMS as ce,
-  OASIS_TOOLBAR_ITEMS as cf,
-  OasisEditorAppLazy as cg,
-  OasisEditorContainer as ch,
-  PluginCollection as ci,
-  Popover as cj,
-  RIBBON_TABS as ck,
-  Select as cl,
-  SelectField as cm,
-  Separator as cn,
-  SidePanel as co,
-  SidePanelBody as cp,
-  SidePanelFooter as cq,
-  SidePanelHeader as cr,
-  SplitButton as cs,
-  StyleGallery as ct,
-  TextField as cu,
-  Button$1 as cv,
-  buildRibbonTabDefinitions as cw,
-  createEditorCommandBus as cx,
-  createOasisEditor as cy,
-  createOasisEditorContainer as cz,
+  Toolbar as c0,
+  OasisEditorLoading as c1,
+  I18nProvider as c2,
+  createTranslator as c3,
+  createEditorLogger as c4,
+  registerDomStatsSurface as c5,
+  Button as c6,
+  Checkbox as c7,
+  ColorPicker as c8,
+  CommandRegistry as c9,
+  createEditorCommandBus as cA,
+  createOasisEditor as cB,
+  createOasisEditorContainer as cC,
+  mount as cD,
+  registerToolbarRenderer as cE,
+  DEFAULT_PALETTE as ca,
+  DialogFooter as cb,
+  FloatingActionButton as cc,
+  GridPicker as cd,
+  IconButton as ce,
+  Menu as cf,
+  OASIS_BUILTIN_COMMANDS as cg,
+  OASIS_MENU_ITEMS as ch,
+  OASIS_TOOLBAR_ITEMS as ci,
+  OasisEditorAppLazy as cj,
+  OasisEditorContainer as ck,
+  PluginCollection as cl,
+  Popover as cm,
+  RIBBON_TABS as cn,
+  Select as co,
+  SelectField as cp,
+  Separator as cq,
+  SidePanel as cr,
+  SidePanelBody as cs,
+  SidePanelFooter as ct,
+  SidePanelHeader as cu,
+  SplitButton as cv,
+  StyleGallery as cw,
+  TextField as cx,
+  Button$1 as cy,
+  buildRibbonTabDefinitions as cz,
   createInitialEditorState as d,
   createEditorParagraphFromRuns as e,
   fontSizePxToPt as f,