oasis-editor 0.0.29 → 0.0.31

package/dist/{index-CMOt03WH.js → index-BYqaCJUC.js}

@@ -2442,7 +2442,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-D0fgzHt5.js").then((m) => {
+    import("./OasisEditorApp-CeDQ_a8-.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -3486,6 +3486,148 @@ function findParagraphTableLocation(document2, paragraphId, activeSectionIndex =
   }
   return { ...entry.tableLocation, zone: entry.location.zone };
 }
+const BULLET_GLYPHS = ["•", "○", "▪", "•", "○", "▪"];
+const ORDERED_DEFAULT_FORMATS = [
+  "decimal",
+  "lowerLetter",
+  "lowerRoman",
+  "decimal",
+  "lowerLetter",
+  "lowerRoman"
+];
+const PUA_BULLET_MAP = {
+  61623: "•",
+  61548: "·",
+  61607: "▪",
+  61656: "➢",
+  61559: "✓",
+  61692: "✓",
+  61671: "⚡",
+  61472: " "
+};
+function toAlpha(value) {
+  if (value <= 0) return String(value);
+  let remaining = value;
+  let output = "";
+  while (remaining > 0) {
+    output = String.fromCharCode(65 + (remaining - 1) % 26) + output;
+    remaining = Math.floor((remaining - 1) / 26);
+  }
+  return output;
+}
+function toRoman$1(value) {
+  if (value <= 0 || value >= 4e3) return String(value);
+  const numerals = [
+    [1e3, "M"],
+    [900, "CM"],
+    [500, "D"],
+    [400, "CD"],
+    [100, "C"],
+    [90, "XC"],
+    [50, "L"],
+    [40, "XL"],
+    [10, "X"],
+    [9, "IX"],
+    [5, "V"],
+    [4, "IV"],
+    [1, "I"]
+  ];
+  let remaining = value;
+  let output = "";
+  for (const [amount, text] of numerals) {
+    while (remaining >= amount) {
+      output += text;
+      remaining -= amount;
+    }
+  }
+  return output;
+}
+function formatOrdinal(value, format) {
+  switch (format) {
+    case "lowerLetter":
+      return toAlpha(value).toLowerCase();
+    case "upperLetter":
+      return toAlpha(value).toUpperCase();
+    case "lowerRoman":
+      return toRoman$1(value).toLowerCase();
+    case "upperRoman":
+      return toRoman$1(value).toUpperCase();
+    default:
+      return String(value);
+  }
+}
+function normalizeBulletGlyph(glyph) {
+  const code2 = glyph.codePointAt(0);
+  return code2 !== void 0 && code2 >= 57344 && code2 <= 63743 ? PUA_BULLET_MAP[code2] ?? "•" : glyph;
+}
+function collectNumberingParagraphs(document2) {
+  const result = [];
+  const collectTextBoxes = (paragraph) => {
+    for (const run of paragraph.runs) {
+      if (run.textBox) collectBlocks2(run.textBox.blocks);
+    }
+  };
+  const collectBlocks2 = (blocks) => {
+    for (const block of blocks) {
+      if (block.type === "paragraph") {
+        result.push(block);
+        collectTextBoxes(block);
+      } else {
+        for (const row of block.rows) {
+          for (const cell of row.cells) collectBlocks2(cell.blocks);
+        }
+      }
+    }
+  };
+  for (const paragraph of getDocumentParagraphs(document2)) {
+    result.push(paragraph);
+    collectTextBoxes(paragraph);
+  }
+  return result;
+}
+function buildListLabels(document2) {
+  const labels = /* @__PURE__ */ new Map();
+  const states = /* @__PURE__ */ new Map();
+  for (const paragraph of collectNumberingParagraphs(document2)) {
+    const list = paragraph.list;
+    if (!list) continue;
+    const level = Math.max(0, list.level ?? 0);
+    if (list.kind === "bullet") {
+      labels.set(
+        paragraph.id,
+        list.bulletGlyph ? normalizeBulletGlyph(list.bulletGlyph) : BULLET_GLYPHS[level % BULLET_GLYPHS.length]
+      );
+      continue;
+    }
+    const key = list.instanceId ? `instance:${list.instanceId}` : "legacy";
+    const state = states.get(key) ?? { counters: [], formats: [] };
+    states.set(key, state);
+    while (state.counters.length <= level) state.counters.push(0);
+    state.counters.length = level + 1;
+    if (list.levelFormats) {
+      list.levelFormats.forEach((format, index) => {
+        state.formats[index] = format;
+      });
+    }
+    state.formats[level] = list.format ?? ORDERED_DEFAULT_FORMATS[level % ORDERED_DEFAULT_FORMATS.length];
+    state.counters[level] = typeof list.startAt === "number" ? list.startAt : state.counters[level] === 0 ? 1 : state.counters[level] + 1;
+    const pattern = list.levelText ?? `%${level + 1}.`;
+    labels.set(
+      paragraph.id,
+      pattern.replace(/%([1-9])/g, (token, rawLevel) => {
+        const referencedLevel = Number(rawLevel) - 1;
+        const value = state.counters[referencedLevel];
+        if (value === void 0) return token;
+        const format = list.legal ? "decimal" : state.formats[referencedLevel] ?? "decimal";
+        return formatOrdinal(value, format);
+      })
+    );
+  }
+  return labels;
+}
+function resolveListLabel(paragraph, labels) {
+  return labels.get(paragraph.id) ?? "";
+}
 function getActiveSectionIndex(state) {
   return state.activeSectionIndex ?? 0;
 }
@@ -11078,6 +11220,19 @@ function getListLabelInset(paragraph, styles) {
   const baseInset = (paragraphStyle.indentLeft ?? 0) + resolveListGutterPx(paragraph, paragraphStyle);
   return baseInset - Math.abs(paragraphStyle.indentHanging ?? 0);
 }
+function getAlignedListLabelInset(paragraph, styles, textStart, labelWidth) {
+  var _a;
+  const start = Math.max(0, getListLabelInset(paragraph, styles));
+  const width = Math.max(0, textStart - start);
+  switch ((_a = paragraph.list) == null ? void 0 : _a.alignment) {
+    case "center":
+      return start + Math.max(0, (width - labelWidth) / 2);
+    case "right":
+      return start + Math.max(0, width - labelWidth);
+    default:
+      return start;
+  }
+}
 function getAvailableWidth(paragraph, styles, contentWidth, isFirstLine) {
   const paragraphStyle = resolveEffectiveParagraphStyle(
     paragraph.style,
@@ -14106,7 +14261,7 @@ const ROMAN_NUMERALS = [
   [4, "iv"],
   [1, "i"]
 ];
-function toRoman$1(value) {
+function toRoman(value) {
   if (value <= 0) return String(value);
   let remaining = value;
   let result = "";
@@ -14133,9 +14288,9 @@ const SYMBOL_MARKS = ["*", "†", "‡", "§", "¶", "#"];
 function getFootnoteDisplayMarker(oneBasedIndex, format = "decimal") {
   switch (format) {
     case "lowerRoman":
-      return toRoman$1(oneBasedIndex);
+      return toRoman(oneBasedIndex);
     case "upperRoman":
-      return toRoman$1(oneBasedIndex).toUpperCase();
+      return toRoman(oneBasedIndex).toUpperCase();
     case "lowerLetter":
       return toLetters(oneBasedIndex);
     case "upperLetter":
@@ -14581,125 +14736,14 @@ function getCachedCanvasImage(src, onUpdate) {
   imageCache.set(src, img);
   return img;
 }
-const listOrdinalsCache = /* @__PURE__ */ new WeakMap();
-function getListOrdinals(document2) {
-  const cached = listOrdinalsCache.get(document2);
-  if (cached) return cached;
-  const result = /* @__PURE__ */ new Map();
-  const paragraphs = getDocumentParagraphs(document2);
-  const counters = /* @__PURE__ */ new Map();
-  for (const paragraph of paragraphs) {
-    const list = paragraph.list;
-    if (!list || list.kind !== "ordered") {
-      continue;
-    }
-    const level = list.level ?? 0;
-    const prev = counters.get(level);
-    const next = prev !== void 0 ? prev + 1 : list.startAt ?? 1;
-    counters.set(level, next);
-    result.set(paragraph.id, next);
-  }
-  listOrdinalsCache.set(document2, result);
-  return result;
-}
-function formatOrdinal(value, format) {
-  switch (format) {
-    case "lowerLetter":
-      return toAlpha(value).toLowerCase();
-    case "upperLetter":
-      return toAlpha(value).toUpperCase();
-    case "lowerRoman":
-      return toRoman(value).toLowerCase();
-    case "upperRoman":
-      return toRoman(value).toUpperCase();
-    case "decimal":
-    default:
-      return String(value);
-  }
-}
-function toAlpha(value) {
-  if (value <= 0) return String(value);
-  let n = value;
-  let out = "";
-  while (n > 0) {
-    const rem = (n - 1) % 26;
-    out = String.fromCharCode(65 + rem) + out;
-    n = Math.floor((n - 1) / 26);
-  }
-  return out;
-}
-function toRoman(value) {
-  if (value <= 0 || value >= 4e3) return String(value);
-  const map = [
-    [1e3, "M"],
-    [900, "CM"],
-    [500, "D"],
-    [400, "CD"],
-    [100, "C"],
-    [90, "XC"],
-    [50, "L"],
-    [40, "XL"],
-    [10, "X"],
-    [9, "IX"],
-    [5, "V"],
-    [4, "IV"],
-    [1, "I"]
-  ];
-  let n = value;
-  let out = "";
-  for (const [v, s] of map) {
-    while (n >= v) {
-      out += s;
-      n -= v;
-    }
-  }
-  return out;
-}
-const PUA_BULLET_MAP = {
-  61623: "•",
-  // Symbol: filled circle bullet
-  61548: "·",
-  // Wingdings: medium bullet
-  61607: "▪",
-  // Wingdings 2: black small square
-  61656: "➢",
-  // Wingdings: arrowhead
-  61559: "✓",
-  // Wingdings: check mark
-  61692: "✓",
-  // Wingdings: check mark (alt)
-  61671: "⚡",
-  // Wingdings: lightning
-  61472: " "
-  // Symbol/Wingdings: space
-};
-function normalizeBulletGlyph(glyph) {
-  const code2 = glyph.codePointAt(0);
-  if (code2 !== void 0 && code2 >= 57344 && code2 <= 63743) {
-    return PUA_BULLET_MAP[code2] ?? "•";
-  }
-  return glyph;
-}
-const BULLET_GLYPHS = ["•", "○", "▪", "•", "○", "▪"];
-const ORDERED_DEFAULT_FORMATS = [
-  "decimal",
-  "lowerLetter",
-  "lowerRoman",
-  "decimal",
-  "lowerLetter",
-  "lowerRoman"
-];
+const listLabelsCache = /* @__PURE__ */ new WeakMap();
 function resolveListPrefix(paragraph, document2) {
-  if (!paragraph.list) return "";
-  const level = paragraph.list.level ?? 0;
-  if (paragraph.list.kind === "bullet") {
-    const raw = paragraph.list.bulletGlyph;
-    if (raw) return normalizeBulletGlyph(raw);
-    return BULLET_GLYPHS[level % BULLET_GLYPHS.length] ?? "•";
+  let labels = listLabelsCache.get(document2);
+  if (!labels) {
+    labels = buildListLabels(document2);
+    listLabelsCache.set(document2, labels);
   }
-  const ordinal = getListOrdinals(document2).get(paragraph.id) ?? paragraph.list.startAt ?? 1;
-  const format = paragraph.list.format && paragraph.list.format !== "bullet" ? paragraph.list.format : ORDERED_DEFAULT_FORMATS[level % ORDERED_DEFAULT_FORMATS.length] ?? "decimal";
-  return `${formatOrdinal(ordinal, format)}.`;
+  return resolveListLabel(paragraph, labels);
 }
 function drawEdge(ctx, border, x1, y1, x2, y2) {
   if (!border || border.type === "none" || border.width <= 0) {
@@ -16909,7 +16953,13 @@ function drawParagraph(ctx, paragraph, lines, state, originX, originY, onUpdate,
       const gap = ctx.measureText(`${listPrefix} `).width;
       const labelInset = getListLabelInset(paragraph, state.document.styles);
       const labelWidth = ctx.measureText(listPrefix).width;
-      const left = first !== void 0 && labelInset + labelWidth > first.left ? Math.max(0, first.left - gap) : Math.max(0, labelInset);
+      const alignedLeft = getAlignedListLabelInset(
+        paragraph,
+        state.document.styles,
+        (first == null ? void 0 : first.left) ?? labelInset + labelWidth,
+        labelWidth
+      );
+      const left = first !== void 0 && labelInset + labelWidth > first.left ? Math.max(0, first.left - gap) : alignedLeft;
       ctx.fillText(listPrefix, originX + left, baselineY);
       ctx.restore();
     }
@@ -31715,191 +31765,173 @@ const FORMAT_MAP = {
   upperRoman: "upperRoman",
   bullet: "bullet"
 };
+function isXmlTrue$1(value) {
+  return value == null || value === "1" || value === "true" || value === "on";
+}
+function parseLevel(level) {
+  const result = {};
+  const formatRaw = getAttributeValue(
+    getFirstChildByTagNameNS(level, WORD_NS, "numFmt"),
+    "val"
+  );
+  if (formatRaw) {
+    result.kind = formatRaw === "bullet" ? "bullet" : "ordered";
+    result.format = FORMAT_MAP[formatRaw];
+  }
+  const suffix = getAttributeValue(
+    getFirstChildByTagNameNS(level, WORD_NS, "suff"),
+    "val"
+  );
+  if (suffix === "tab" || suffix === "space" || suffix === "nothing") {
+    result.suffix = suffix;
+  }
+  const startRaw = getAttributeValue(
+    getFirstChildByTagNameNS(level, WORD_NS, "start"),
+    "val"
+  );
+  if (startRaw != null) {
+    const startAt = Number.parseInt(startRaw, 10);
+    if (Number.isFinite(startAt)) result.startAt = startAt;
+  }
+  result.levelText = getAttributeValue(
+    getFirstChildByTagNameNS(level, WORD_NS, "lvlText"),
+    "val"
+  ) ?? void 0;
+  const alignment = getAttributeValue(
+    getFirstChildByTagNameNS(level, WORD_NS, "lvlJc"),
+    "val"
+  );
+  if (alignment === "left" || alignment === "center" || alignment === "right") {
+    result.alignment = alignment;
+  }
+  const legal = getFirstChildByTagNameNS(level, WORD_NS, "isLgl");
+  if (legal) result.legal = isXmlTrue$1(getAttributeValue(legal, "val"));
+  if (result.kind === "bullet" && result.levelText) {
+    result.bulletGlyph = result.levelText;
+  }
+  const rPr = getFirstChildByTagNameNS(level, WORD_NS, "rPr");
+  const rFonts = getFirstChildByTagNameNS(rPr, WORD_NS, "rFonts");
+  result.bulletFont = getAttributeValue(rFonts, "ascii") ?? getAttributeValue(rFonts, "hAnsi") ?? void 0;
+  const pPr = getFirstChildByTagNameNS(level, WORD_NS, "pPr");
+  const ind = getFirstChildByTagNameNS(pPr, WORD_NS, "ind");
+  if (ind) {
+    const leftRaw = getAttributeValue(ind, "left") ?? getAttributeValue(ind, "start");
+    const hangingRaw = getAttributeValue(ind, "hanging");
+    const left = leftRaw != null ? twipsToPx(leftRaw, 0) : void 0;
+    const hanging = hangingRaw != null ? twipsToPx(hangingRaw, 0) : void 0;
+    if (left !== void 0 || hanging !== void 0)
+      result.indent = { left, hanging };
+  }
+  return result;
+}
 function parseNumbering(numberingXml) {
-  const abstractKinds = /* @__PURE__ */ new Map();
-  const numKinds = /* @__PURE__ */ new Map();
-  const abstractIndents = /* @__PURE__ */ new Map();
-  const abstractSuffixes = /* @__PURE__ */ new Map();
-  const abstractFormats = /* @__PURE__ */ new Map();
-  const abstractStarts = /* @__PURE__ */ new Map();
-  const abstractBulletGlyphs = /* @__PURE__ */ new Map();
-  const abstractBulletFonts = /* @__PURE__ */ new Map();
-  const numStartOverrides = /* @__PURE__ */ new Map();
-  const numToAbstractId = /* @__PURE__ */ new Map();
-  const seenInstances = /* @__PURE__ */ new Set();
-  const emptyResult = () => ({
-    abstractKinds,
-    numKinds,
-    abstractIndents,
-    abstractSuffixes,
-    abstractFormats,
-    abstractStarts,
-    abstractBulletGlyphs,
-    abstractBulletFonts,
-    numStartOverrides,
-    numToAbstractId,
-    seenInstances
-  });
-  if (!numberingXml) return emptyResult();
+  const maps = {
+    abstractLevels: /* @__PURE__ */ new Map(),
+    numOverrideLevels: /* @__PURE__ */ new Map(),
+    numStartOverrides: /* @__PURE__ */ new Map(),
+    numToAbstractId: /* @__PURE__ */ new Map(),
+    seenInstances: /* @__PURE__ */ new Set()
+  };
+  if (!numberingXml) return maps;
   const document2 = new DOMParser$1().parseFromString(
     numberingXml,
     "application/xml"
   );
   const numbering = document2.documentElement;
-  if (!numbering) return emptyResult();
-  const abstractNums = numbering.getElementsByTagNameNS(WORD_NS, "abstractNum");
-  for (let index = 0; index < abstractNums.length; index += 1) {
-    const abstractNum = abstractNums[index];
+  if (!numbering) return maps;
+  for (const abstractNum of Array.from(
+    numbering.getElementsByTagNameNS(WORD_NS, "abstractNum")
+  )) {
     const abstractId = getAttributeValue(abstractNum, "abstractNumId");
     if (!abstractId) continue;
     for (const level of getChildrenByTagNameNS(abstractNum, WORD_NS, "lvl")) {
       const ilvl = getAttributeValue(level, "ilvl") ?? "0";
-      const levelKey = `${abstractId}:${ilvl}`;
-      const numFmt = getFirstChildByTagNameNS(level, WORD_NS, "numFmt");
-      const format = getAttributeValue(numFmt, "val");
-      if (format) {
-        abstractKinds.set(
-          levelKey,
-          format === "bullet" ? "bullet" : "ordered"
+      maps.abstractLevels.set(`${abstractId}:${ilvl}`, parseLevel(level));
+    }
+  }
+  for (const num of Array.from(
+    numbering.getElementsByTagNameNS(WORD_NS, "num")
+  )) {
+    const numId = getAttributeValue(num, "numId");
+    const abstractId = getAttributeValue(
+      getFirstChildByTagNameNS(num, WORD_NS, "abstractNumId"),
+      "val"
+    );
+    if (!numId || !abstractId) continue;
+    maps.numToAbstractId.set(numId, abstractId);
+    for (const override of getChildrenByTagNameNS(
+      num,
+      WORD_NS,
+      "lvlOverride"
+    )) {
+      const ilvl = getAttributeValue(override, "ilvl") ?? "0";
+      const overrideLevel = getFirstChildByTagNameNS(override, WORD_NS, "lvl");
+      if (overrideLevel) {
+        maps.numOverrideLevels.set(
+          `${numId}:${ilvl}`,
+          parseLevel(overrideLevel)
         );
-        if (ilvl === "0") {
-          abstractKinds.set(
-            abstractId,
-            format === "bullet" ? "bullet" : "ordered"
-          );
-        }
-        const editorFormat = FORMAT_MAP[format];
-        if (editorFormat) abstractFormats.set(levelKey, editorFormat);
-      }
-      const suffRaw = getAttributeValue(
-        getFirstChildByTagNameNS(level, WORD_NS, "suff"),
-        "val"
-      );
-      if (suffRaw === "space" || suffRaw === "nothing" || suffRaw === "tab") {
-        abstractSuffixes.set(levelKey, suffRaw);
       }
       const startRaw = getAttributeValue(
-        getFirstChildByTagNameNS(level, WORD_NS, "start"),
+        getFirstChildByTagNameNS(override, WORD_NS, "startOverride"),
         "val"
       );
       if (startRaw != null) {
-        const n = parseInt(startRaw, 10);
-        if (!isNaN(n)) abstractStarts.set(levelKey, n);
-      }
-      if (format === "bullet") {
-        const lvlTextEl = getFirstChildByTagNameNS(level, WORD_NS, "lvlText");
-        const glyph = getAttributeValue(lvlTextEl, "val");
-        if (glyph) abstractBulletGlyphs.set(levelKey, glyph);
-      }
-      const rPr = getFirstChildByTagNameNS(level, WORD_NS, "rPr");
-      const rFonts = getFirstChildByTagNameNS(rPr, WORD_NS, "rFonts");
-      const fontName = getAttributeValue(rFonts, "ascii") ?? getAttributeValue(rFonts, "hAnsi");
-      if (fontName) abstractBulletFonts.set(levelKey, fontName);
-      const pPr = getFirstChildByTagNameNS(level, WORD_NS, "pPr");
-      const ind = getFirstChildByTagNameNS(pPr, WORD_NS, "ind");
-      if (ind) {
-        const leftRaw = getAttributeValue(ind, "left") ?? getAttributeValue(ind, "start");
-        const hangingRaw = getAttributeValue(ind, "hanging");
-        const left = leftRaw != null ? twipsToPx(leftRaw, 0) : void 0;
-        const hanging = hangingRaw != null ? twipsToPx(hangingRaw, 0) : void 0;
-        if (left !== void 0 || hanging !== void 0) {
-          abstractIndents.set(levelKey, { left, hanging });
+        const startAt = Number.parseInt(startRaw, 10);
+        if (Number.isFinite(startAt)) {
+          maps.numStartOverrides.set(`${numId}:${ilvl}`, startAt);
         }
       }
     }
   }
-  const nums = numbering.getElementsByTagNameNS(WORD_NS, "num");
-  for (let index = 0; index < nums.length; index += 1) {
-    const num = nums[index];
-    const numId = getAttributeValue(num, "numId");
-    const abstractNumIdElement = getFirstChildByTagNameNS(
-      num,
-      WORD_NS,
-      "abstractNumId"
-    );
-    const abstractNumId = getAttributeValue(abstractNumIdElement, "val");
-    if (!numId || !abstractNumId) {
-      continue;
-    }
-    numToAbstractId.set(numId, abstractNumId);
-    numKinds.set(numId, abstractKinds.get(abstractNumId) ?? "ordered");
-    for (const override of getChildrenByTagNameNS(num, WORD_NS, "lvlOverride")) {
-      const overrideIlvl = getAttributeValue(override, "ilvl");
-      if (!overrideIlvl) continue;
-      const startOverrideEl = getFirstChildByTagNameNS(
-        override,
-        WORD_NS,
-        "startOverride"
-      );
-      const startOverrideRaw = getAttributeValue(startOverrideEl, "val");
-      if (startOverrideRaw != null) {
-        const n = parseInt(startOverrideRaw, 10);
-        if (!isNaN(n)) numStartOverrides.set(`${numId}:${overrideIlvl}`, n);
-      }
-    }
-  }
-  return {
-    abstractKinds,
-    numKinds,
-    abstractIndents,
-    abstractSuffixes,
-    abstractFormats,
-    abstractStarts,
-    abstractBulletGlyphs,
-    abstractBulletFonts,
-    numStartOverrides,
-    numToAbstractId,
-    seenInstances
-  };
+  return maps;
+}
+function effectiveLevel(numberingMaps, numId, ilvl) {
+  const abstractId = numberingMaps.numToAbstractId.get(numId);
+  const base = abstractId ? numberingMaps.abstractLevels.get(`${abstractId}:${ilvl}`) : void 0;
+  const override = numberingMaps.numOverrideLevels.get(`${numId}:${ilvl}`);
+  return override ?? base ?? {};
 }
 function parseParagraphList(paragraphProperties, numberingMaps) {
-  if (!paragraphProperties) {
-    return void 0;
-  }
+  if (!paragraphProperties) return void 0;
   const numPr = getFirstChildByTagNameNS(paragraphProperties, WORD_NS, "numPr");
-  if (!numPr) {
-    return void 0;
-  }
+  if (!numPr) return void 0;
   const numId = getAttributeValue(
     getFirstChildByTagNameNS(numPr, WORD_NS, "numId"),
     "val"
   );
-  if (!numId) {
-    return void 0;
-  }
-  const ilvlValue = getAttributeValue(
+  if (!numId) return void 0;
+  const ilvlRaw = getAttributeValue(
     getFirstChildByTagNameNS(numPr, WORD_NS, "ilvl"),
     "val"
   ) ?? "0";
-  const level = Number(ilvlValue);
-  const abstractId = numberingMaps.numToAbstractId.get(numId);
-  const levelKey = abstractId ? `${abstractId}:${ilvlValue}` : void 0;
-  const indent = levelKey ? numberingMaps.abstractIndents.get(levelKey) : void 0;
-  const suffix = (levelKey ? numberingMaps.abstractSuffixes.get(levelKey) : void 0) ?? "tab";
-  const format = levelKey ? numberingMaps.abstractFormats.get(levelKey) : void 0;
-  const bulletGlyph = levelKey ? numberingMaps.abstractBulletGlyphs.get(levelKey) : void 0;
-  const bulletFont = levelKey ? numberingMaps.abstractBulletFonts.get(levelKey) : void 0;
-  const instanceKey = `${numId}:${ilvlValue}`;
+  const level = Number.parseInt(ilvlRaw, 10);
+  const safeLevel = Number.isFinite(level) ? level : 0;
+  const effective = effectiveLevel(numberingMaps, numId, safeLevel);
+  const levelFormats = [];
+  for (let index = 0; index <= safeLevel; index += 1) {
+    levelFormats[index] = effectiveLevel(numberingMaps, numId, index).format ?? "decimal";
+  }
+  const instanceKey = `${numId}:${safeLevel}`;
   const isFirstInInstance = !numberingMaps.seenInstances.has(instanceKey);
   numberingMaps.seenInstances.add(instanceKey);
-  let startAt;
-  if (isFirstInInstance) {
-    const override = numberingMaps.numStartOverrides.get(instanceKey);
-    const abstractStart = levelKey ? numberingMaps.abstractStarts.get(levelKey) : void 0;
-    const effectiveStart = override ?? abstractStart ?? 1;
-    if (effectiveStart !== 1) startAt = effectiveStart;
-  }
+  const startAt = isFirstInInstance ? numberingMaps.numStartOverrides.get(instanceKey) ?? effective.startAt : void 0;
   return {
     list: {
-      kind: numberingMaps.numKinds.get(numId) ?? "ordered",
-      level: Number.isFinite(level) ? level : 0,
-      suffix,
-      ...format !== void 0 && { format },
-      ...startAt !== void 0 && { startAt },
-      ...bulletGlyph !== void 0 && { bulletGlyph },
-      ...bulletFont !== void 0 && { bulletFont }
+      kind: effective.kind ?? "ordered",
+      level: safeLevel,
+      instanceId: numId,
+      suffix: effective.suffix ?? "tab",
+      ...effective.format ? { format: effective.format } : {},
+      ...levelFormats.length ? { levelFormats } : {},
+      ...effective.levelText ? { levelText: effective.levelText } : {},
+      ...effective.alignment ? { alignment: effective.alignment } : {},
+      ...effective.legal !== void 0 ? { legal: effective.legal } : {},
+      ...startAt !== void 0 && startAt !== 1 ? { startAt } : {},
+      ...effective.bulletGlyph ? { bulletGlyph: effective.bulletGlyph } : {},
+      ...effective.bulletFont ? { bulletFont: effective.bulletFont } : {}
     },
-    indent
+    indent: effective.indent
   };
 }
 function stripUndefined(value) {
@@ -34424,6 +34456,24 @@ function applyConditionalTextStyle(paragraphs, textStyle) {
     }
   }
 }
+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, styles) {
   var _a, _b;
   const gridCols = [];
@@ -34496,6 +34546,19 @@ 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,
@@ -34504,7 +34567,7 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
             relsMap,
             assets,
             theme,
-            inheritedParagraphStyle
+            cellInheritedStyle
           )
         );
         autospacingFlags.push(
@@ -35819,7 +35882,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-DcrboJNQ.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-C8ErVbAl.js", import.meta.url).href,
         import.meta.url
       ),
       {
@@ -40154,154 +40217,157 @@ export {
   imageExtensionFromMime as Z,
   pxToPt as _,
   getParagraphLength as a,
-  createComponent as a$,
+  createMemo as a$,
   buildCanvasTableLayout as a0,
   resolveFloatingObjectRect as a1,
   getTextBoxFloatingGeometry as a2,
   getPresetPathSegments as a3,
   projectBlocksLayout as a4,
-  textStyleToFontSizePt as a5,
-  PX_PER_POINT$2 as a6,
-  DEFAULT_FONT_SIZE_PX as a7,
-  isDoubleUnderlineStyle as a8,
-  isWavyUnderlineStyle as a9,
-  parseFontSizePtToPx as aA,
-  formatFontSizePt as aB,
-  listKindForTag as aC,
-  isParagraphTag as aD,
-  collectInlineRuns as aE,
-  parseParagraphStyle as aF,
-  t as aG,
-  getHeadingLevel as aH,
-  preciseFontModeVersion as aI,
-  isPreciseFontModeEnabled as aJ,
-  togglePreciseFontMode as aK,
-  nextFontSizePt as aL,
-  previousFontSizePt as aM,
-  fontSizePtToPx as aN,
-  createDefaultToolbarPreset as aO,
-  defaultMenuItems as aP,
-  MenuRegistry as aQ,
-  createToolbarRegistry as aR,
-  Editor as aS,
-  resolveCommandRef as aT,
-  commandRefName as aU,
-  InlineShell as aV,
-  BalloonShell as aW,
-  DocumentShell as aX,
-  createMemo as aY,
-  getCaretRectFromSnapshot as aZ,
-  getParagraphRectFromSnapshot as a_,
-  underlineStyleLineWidthPx as aa,
-  underlineStyleDashArray as ab,
-  getListLabelInset as ac,
-  getParagraphBorderInsets as ad,
-  normalizeFamily as ae,
-  ROBOTO_FONT_FILES as af,
-  loadFontAsset as ag,
-  OFFICE_COMPAT_FONT_FAMILIES as ah,
-  buildSfnt as ai,
-  defaultFontDecoderRegistry as aj,
-  SfntFontProgram as ak,
-  collectPdfFontFamilies as al,
-  projectDocumentLayout as am,
-  getPageHeaderZoneTop as an,
-  getPageBodyTop as ao,
-  getPageColumnRects as ap,
-  findFootnoteReference as aq,
-  FOOTNOTE_MARKER_GUTTER_PX as ar,
-  resolveImporterForFile as as,
-  createEditorStateFromDocument as at,
-  getDocumentParagraphsCanonical as au,
-  getToolbarStyleState as av,
-  STANDARD_FONT_SIZES_PT as aw,
-  fontSizePxToPt as ax,
-  probeLocalFontFamilies as ay,
-  createInitialEditorState as az,
+  buildListLabels as a5,
+  textStyleToFontSizePt as a6,
+  PX_PER_POINT$2 as a7,
+  DEFAULT_FONT_SIZE_PX as a8,
+  isDoubleUnderlineStyle as a9,
+  fontSizePxToPt as aA,
+  probeLocalFontFamilies as aB,
+  createInitialEditorState as aC,
+  parseFontSizePtToPx as aD,
+  formatFontSizePt as aE,
+  listKindForTag as aF,
+  isParagraphTag as aG,
+  collectInlineRuns as aH,
+  parseParagraphStyle as aI,
+  t as aJ,
+  getHeadingLevel as aK,
+  preciseFontModeVersion as aL,
+  isPreciseFontModeEnabled as aM,
+  togglePreciseFontMode as aN,
+  nextFontSizePt as aO,
+  previousFontSizePt as aP,
+  fontSizePtToPx as aQ,
+  createDefaultToolbarPreset as aR,
+  defaultMenuItems as aS,
+  MenuRegistry as aT,
+  createToolbarRegistry as aU,
+  Editor as aV,
+  resolveCommandRef as aW,
+  commandRefName as aX,
+  InlineShell as aY,
+  BalloonShell as aZ,
+  DocumentShell as a_,
+  isWavyUnderlineStyle as aa,
+  underlineStyleLineWidthPx as ab,
+  underlineStyleDashArray as ac,
+  resolveListLabel as ad,
+  getListLabelInset as ae,
+  getAlignedListLabelInset as af,
+  getParagraphBorderInsets as ag,
+  normalizeFamily as ah,
+  ROBOTO_FONT_FILES as ai,
+  loadFontAsset as aj,
+  OFFICE_COMPAT_FONT_FAMILIES as ak,
+  buildSfnt as al,
+  defaultFontDecoderRegistry as am,
+  SfntFontProgram as an,
+  collectPdfFontFamilies as ao,
+  projectDocumentLayout as ap,
+  getPageHeaderZoneTop as aq,
+  getPageBodyTop as ar,
+  getPageColumnRects as as,
+  findFootnoteReference as at,
+  FOOTNOTE_MARKER_GUTTER_PX as au,
+  resolveImporterForFile as av,
+  createEditorStateFromDocument as aw,
+  getDocumentParagraphsCanonical as ax,
+  getToolbarStyleState as ay,
+  STANDARD_FONT_SIZES_PT as az,
   createEditorRun as b,
-  PluginCollection as b$,
-  CaretOverlay as b0,
-  Show as b1,
-  createRenderEffect as b2,
-  style as b3,
-  setAttribute as b4,
-  setStyleProperty as b5,
-  memo as b6,
-  template as b7,
-  insert as b8,
-  use as b9,
-  createEditorZoom as bA,
-  startLongTaskObserver as bB,
-  installGlobalReport as bC,
-  applyStoredPreciseFontPreference as bD,
-  getWelcomeSeen as bE,
-  isLocalFontAccessSupported as bF,
-  EDITOR_SCROLL_PADDING_PX as bG,
-  Toolbar as bH,
-  OasisEditorLoading as bI,
-  createEditorLogger as bJ,
-  getCachedCanvasImage as bK,
-  registerDomStatsSurface as bL,
-  Button as bM,
-  Checkbox as bN,
-  ColorPicker as bO,
-  CommandRegistry as bP,
-  DEFAULT_PALETTE as bQ,
-  DialogFooter as bR,
-  FloatingActionButton as bS,
-  GridPicker as bT,
-  IconButton as bU,
-  Menu as bV,
-  OASIS_BUILTIN_COMMANDS as bW,
-  OASIS_MENU_ITEMS as bX,
-  OASIS_TOOLBAR_ITEMS as bY,
-  OasisEditorAppLazy as bZ,
-  OasisEditorContainer as b_,
-  addEventListener as ba,
-  Dialog as bb,
-  delegateEvents as bc,
-  className as bd,
-  For as be,
-  UNDERLINE_STYLE_OPTIONS as bf,
-  Tabs as bg,
-  measureParagraphMinContentWidthPx as bh,
-  getEditableBlocksForZone as bi,
-  findParagraphLocation as bj,
-  createSectionBoundaryParagraph as bk,
-  normalizePageSettings as bl,
-  DEFAULT_EDITOR_PAGE_SETTINGS as bm,
-  markStart as bn,
-  markEnd as bo,
-  getParagraphEntries as bp,
-  getParagraphById as bq,
-  PluginUiHost as br,
-  OasisEditorEditor as bs,
-  perfTimer as bt,
-  OasisBrandMark as bu,
-  setPreciseFontPreference as bv,
-  setWelcomeSeen as bw,
-  enablePreciseFontMode as bx,
-  createOasisEditorClient as by,
-  setLocale as bz,
+  OASIS_TOOLBAR_ITEMS as b$,
+  getCaretRectFromSnapshot as b0,
+  getParagraphRectFromSnapshot as b1,
+  createComponent as b2,
+  CaretOverlay as b3,
+  Show as b4,
+  createRenderEffect as b5,
+  style as b6,
+  setAttribute as b7,
+  setStyleProperty as b8,
+  memo as b9,
+  enablePreciseFontMode as bA,
+  createOasisEditorClient as bB,
+  setLocale as bC,
+  createEditorZoom as bD,
+  startLongTaskObserver as bE,
+  installGlobalReport as bF,
+  applyStoredPreciseFontPreference as bG,
+  getWelcomeSeen as bH,
+  isLocalFontAccessSupported as bI,
+  EDITOR_SCROLL_PADDING_PX as bJ,
+  Toolbar as bK,
+  OasisEditorLoading as bL,
+  createEditorLogger as bM,
+  getCachedCanvasImage as bN,
+  registerDomStatsSurface as bO,
+  Button as bP,
+  Checkbox as bQ,
+  ColorPicker as bR,
+  CommandRegistry as bS,
+  DEFAULT_PALETTE as bT,
+  DialogFooter as bU,
+  FloatingActionButton as bV,
+  GridPicker as bW,
+  IconButton as bX,
+  Menu as bY,
+  OASIS_BUILTIN_COMMANDS as bZ,
+  OASIS_MENU_ITEMS as b_,
+  template as ba,
+  insert as bb,
+  use as bc,
+  addEventListener as bd,
+  Dialog as be,
+  delegateEvents as bf,
+  className as bg,
+  For as bh,
+  UNDERLINE_STYLE_OPTIONS as bi,
+  Tabs as bj,
+  measureParagraphMinContentWidthPx as bk,
+  getEditableBlocksForZone as bl,
+  findParagraphLocation as bm,
+  createSectionBoundaryParagraph as bn,
+  normalizePageSettings as bo,
+  DEFAULT_EDITOR_PAGE_SETTINGS as bp,
+  markStart as bq,
+  markEnd as br,
+  getParagraphEntries as bs,
+  getParagraphById as bt,
+  PluginUiHost as bu,
+  OasisEditorEditor as bv,
+  perfTimer as bw,
+  OasisBrandMark as bx,
+  setPreciseFontPreference as by,
+  setWelcomeSeen as bz,
   createEditorParagraphFromRuns as c,
-  Popover as c0,
-  RIBBON_TABS as c1,
-  RIBBON_TAB_DEFINITIONS as c2,
-  Select as c3,
-  SelectField as c4,
-  Separator as c5,
-  SidePanel as c6,
-  SidePanelBody as c7,
-  SidePanelFooter as c8,
-  SidePanelHeader as c9,
-  SplitButton as ca,
-  TextField as cb,
-  Button$1 as cc,
-  createEditorCommandBus as cd,
-  createOasisEditor as ce,
-  createOasisEditorContainer as cf,
-  mount as cg,
-  registerToolbarRenderer as ch,
+  OasisEditorAppLazy as c0,
+  OasisEditorContainer as c1,
+  PluginCollection as c2,
+  Popover as c3,
+  RIBBON_TABS as c4,
+  RIBBON_TAB_DEFINITIONS as c5,
+  Select as c6,
+  SelectField as c7,
+  Separator as c8,
+  SidePanel as c9,
+  SidePanelBody as ca,
+  SidePanelFooter as cb,
+  SidePanelHeader as cc,
+  SplitButton as cd,
+  TextField as ce,
+  Button$1 as cf,
+  createEditorCommandBus as cg,
+  createOasisEditor as ch,
+  createOasisEditorContainer as ci,
+  mount as cj,
+  registerToolbarRenderer as ck,
   getDocumentSections as d,
   createEditorStyledRun as e,
   getParagraphText as f,