oasis-editor 0.0.56 → 0.0.57

package/dist/import/docx/tableConditionalFormatting.d.ts

@@ -0,0 +1,48 @@
+import { Element as XmlElement } from '@xmldom/xmldom';
+import { EditorNamedStyle, EditorParagraphNode, EditorParagraphStyle, EditorTableConditionalFormat, EditorTextStyle } from '../../core/model.js';
+
+export interface TableLook {
+    firstRow: boolean;
+    lastRow: boolean;
+    firstCol: boolean;
+    lastCol: boolean;
+    noHBand: boolean;
+    noVBand: boolean;
+}
+/**
+ * Parses `w:tblLook`, which gates which table-style conditional formats apply.
+ * Supports both the modern individual attributes (`firstRow`, `firstColumn`,
+ * `noVBand`, ...) and the legacy hex bitmask in `@w:val`. When the element is
+ * absent we default to Word's common case: first row + first column on, banding
+ * on.
+ */
+export declare function parseTableLook(tblPr: XmlElement | null): TableLook;
+/**
+ * Returns the table-style conditional-format keys that apply to a cell at the
+ * given position, ordered low→high precedence (later entries override earlier
+ * ones). Mirrors Word's resolution order: whole table < bands < first/last col
+ * < first/last row < corner cells. Banding and first/last row/col are gated by
+ * `tblLook`; banding parity is computed over the "body" rows/cols that remain
+ * after excluding the special first/last row/col.
+ */
+export declare function resolveCellConditionalKeys(rowIndex: number, colIndex: number, rowCount: number, colCount: number, look: TableLook, rowBandSize: number, colBandSize: number): string[];
+/** Merges resolved conditional formats (low→high precedence) into one. */
+export declare function mergeConditionalFormats(keys: string[], conditionals: Record<string, EditorTableConditionalFormat> | undefined): EditorTableConditionalFormat;
+/**
+ * Applies a conditional run text style (bold/color from the table style)
+ * beneath each run's own style, so explicit run formatting still wins.
+ */
+export declare function applyConditionalTextStyle(paragraphs: EditorParagraphNode[], textStyle: EditorTextStyle | undefined): void;
+/**
+ * Filter a table style's paragraph properties (its `<w:pPr>`) so they sit at the
+ * correct OOXML precedence for a given cell paragraph.
+ *
+ * Per ECMA-376 §17.7.2 the order (low → high) is:
+ *   docDefaults < table style < paragraph style < direct formatting.
+ * So any property the paragraph's own (named) style explicitly defines must win
+ * over the table style. We strip those keys from the inherited table-style pPr;
+ * what remains only fills gaps the paragraph style leaves open. Without this, a
+ * table style like `TableGrid` (which sets `spacing after="0"`) would wrongly
+ * override Normal's `after="120"` and collapse cell row height vs Word.
+ */
+export declare function tableStyleParagraphInheritance(tableStylePPr: EditorParagraphStyle | undefined, paragraphStyleId: string | undefined, styles: Record<string, EditorNamedStyle> | undefined): EditorParagraphStyle | undefined;

package/dist/{index-TE81CHER.js → index-DiZU2BUt.js}

@@ -2483,7 +2483,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-jjFz0I9R.js").then((m) => {
+    import("./OasisEditorApp-BQ5KeU1o.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -33818,6 +33818,105 @@ async function parseParagraphNode(paragraphNode, numberingMaps, zip, relsMap, as
   );
   return parsed.paragraphs[0] ?? createEditorParagraphFromRuns([{ text: "" }]);
 }
+function parseTableLook(tblPr) {
+  const element = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblLook");
+  const attr = (name) => {
+    const value = getAttributeValue(element, name);
+    return value === null || value === "" ? void 0 : isWordTrue(value);
+  };
+  const rawVal = getAttributeValue(element, "val");
+  const mask = rawVal ? Number.parseInt(rawVal, 16) : Number.NaN;
+  const bit = (flag) => Number.isFinite(mask) ? (mask & flag) !== 0 : void 0;
+  return {
+    firstRow: attr("firstRow") ?? bit(32) ?? true,
+    lastRow: attr("lastRow") ?? bit(64) ?? false,
+    firstCol: attr("firstColumn") ?? bit(128) ?? true,
+    lastCol: attr("lastColumn") ?? bit(256) ?? false,
+    noHBand: attr("noHBand") ?? bit(512) ?? false,
+    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;
@@ -34250,102 +34349,6 @@ function applyTableBordersToRows(rows, tblBorders) {
     }
   }
 }
-function parseTableLook(tblPr) {
-  const element = getFirstChildByTagNameNS(tblPr, WORD_NS, "tblLook");
-  const attr = (name) => {
-    const value = getAttributeValue(element, name);
-    return value === null || value === "" ? void 0 : isWordTrue(value);
-  };
-  const rawVal = getAttributeValue(element, "val");
-  const mask = rawVal ? Number.parseInt(rawVal, 16) : Number.NaN;
-  const bit = (flag) => Number.isFinite(mask) ? (mask & flag) !== 0 : void 0;
-  return {
-    firstRow: attr("firstRow") ?? bit(32) ?? true,
-    lastRow: attr("lastRow") ?? bit(64) ?? false,
-    firstCol: attr("firstColumn") ?? bit(128) ?? true,
-    lastCol: attr("lastColumn") ?? bit(256) ?? false,
-    noHBand: attr("noHBand") ?? bit(512) ?? false,
-    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);
-}
 async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, theme, parseNestedBlocks, styles) {
   var _a, _b;
   const gridCols = [];
@@ -35536,7 +35539,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-DbI0FKvR.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-BWyqey19.js", import.meta.url).href,
         import.meta.url
       ),
       {

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { b2, bV, bW, bX, bY, bZ, bk, b_, b3, a_, b$, c0, c1, b1, c2, aY, c3, c4, c5, c6, c7, bQ, c8, c9, ca, cb, cc, cd, ce, cf, cg, ch, ci, bp, cj, bP, ck, bX as bX2, c0 as c02, c2 as c22, cb as cb2, cd as cd2, ci as ci2, cl, b0, aX, cm, cn, co, aZ, cp, cq, a$ } from "./index-TE81CHER.js";
+import { b2, bV, bW, bX, bY, bZ, bk, b_, b3, a_, b$, c0, c1, b1, c2, aY, c3, c4, c5, c6, c7, bQ, c8, c9, ca, cb, cc, cd, ce, cf, cg, ch, ci, bp, cj, bP, ck, bX as bX2, c0 as c02, c2 as c22, cb as cb2, cd as cd2, ci as ci2, cl, b0, aX, cm, cn, co, aZ, cp, cq, a$ } from "./index-DiZU2BUt.js";
 export {
   b2 as BalloonShell,
   bV as Button,