@harbour-enterprises/superdoc 1.3.0-next.2 → 1.3.0-next.4

package/dist/chunks/{index-C2XLSjq0.cjs → index-Buh63pW6.cjs}

@@ -1,7 +1,7 @@
 "use strict";
 const jszip = require("./jszip-C8_CqJxM.cjs");
 const helpers$1 = require("./helpers-nOdwpmwb.cjs");
-const superEditor_converter = require("./SuperConverter-DOTz2R8L.cjs");
+const superEditor_converter = require("./SuperConverter-qB6m0K1X.cjs");
 const vue = require("./vue-De9wkgLl.cjs");
 require("./jszip.min-BPh2MMAa.cjs");
 const eventemitter3 = require("./eventemitter3-BQuRcMPI.cjs");
@@ -175,6 +175,354 @@ function parseSizeUnit(val = "0") {
 function minMax(value = 0, min2 = 0, max2 = 0) {
   return Math.min(Math.max(value, min2), max2);
 }
+const FONT_FAMILY_FALLBACKS = Object.freeze({
+  swiss: "Arial, sans-serif",
+  roman: "Times New Roman, serif",
+  modern: "Courier New, monospace",
+  script: "cursive",
+  decorative: "fantasy",
+  system: "system-ui",
+  auto: "sans-serif"
+});
+const DEFAULT_GENERIC_FALLBACK = "sans-serif";
+const normalizeParts = (value) => (value || "").split(",").map((part) => part.trim()).filter(Boolean);
+function mapWordFamilyFallback(wordFamily) {
+  if (!wordFamily) return DEFAULT_GENERIC_FALLBACK;
+  const mapped = FONT_FAMILY_FALLBACKS[wordFamily.toLowerCase()];
+  return mapped || DEFAULT_GENERIC_FALLBACK;
+}
+function toCssFontFamily(fontName, options = {}) {
+  if (!fontName || typeof fontName !== "string") return fontName;
+  const trimmed = fontName.trim();
+  if (!trimmed || trimmed.includes(",")) return trimmed;
+  const { fallback, wordFamily } = options;
+  const fallbackValue = fallback ?? (wordFamily ? mapWordFamilyFallback(wordFamily) : void 0) ?? DEFAULT_GENERIC_FALLBACK;
+  const fallbackParts = normalizeParts(fallbackValue);
+  if (fallbackParts.length === 0) {
+    return trimmed;
+  }
+  const normalizedName = trimmed.toLowerCase();
+  const includesName = fallbackParts.some((part) => part.toLowerCase() === normalizedName);
+  if (includesName) {
+    return fallbackParts.join(", ");
+  }
+  return [trimmed, ...fallbackParts].join(", ");
+}
+const sdtMetadataCache = /* @__PURE__ */ new Map();
+function resolveStyle(node, context, options = {}) {
+  let paragraph = createDefaultParagraph();
+  let character = createDefaultCharacter(context);
+  let numbering;
+  const chain = resolveStyleChain(node.styleId, context.styles);
+  for (const style2 of chain) {
+    paragraph = mergeParagraph(paragraph, style2.paragraph);
+    character = mergeCharacter(character, style2.character);
+    if (!numbering && style2.numbering) {
+      numbering = resolveNumbering(style2.numbering.numId, style2.numbering.level, context);
+    }
+  }
+  paragraph = mergeParagraph(paragraph, node.paragraphProps);
+  character = mergeCharacter(character, node.characterProps);
+  if (node.numbering) {
+    numbering = resolveNumbering(node.numbering.numId, node.numbering.level, context);
+  }
+  const sdt = options?.sdt ? resolveSdtMetadata(options.sdt) : void 0;
+  return {
+    paragraph,
+    character,
+    numbering,
+    sdt
+  };
+}
+function resolveNumbering(numId, level, context) {
+  const def = context.numbering?.[numId];
+  if (!def) return void 0;
+  const levelDef = def.levels.find((entry) => entry.level === level) ?? def.levels[level];
+  if (!levelDef) return void 0;
+  return {
+    numId,
+    level,
+    indent: {
+      left: levelDef.indent?.left,
+      hanging: levelDef.indent?.hanging
+    },
+    format: levelDef.format ?? "decimal",
+    text: levelDef.text ?? "%1.",
+    start: levelDef.start ?? 1
+  };
+}
+function resolveSdtMetadata(input) {
+  if (!input) return void 0;
+  const { nodeType, attrs, cacheKey: explicitKey } = input;
+  if (!nodeType) return void 0;
+  const normalizedAttrs = isPlainObject$4(attrs) ? attrs : {};
+  const cacheKey = buildSdtCacheKey(nodeType, normalizedAttrs, explicitKey);
+  if (cacheKey && sdtMetadataCache.has(cacheKey)) {
+    return sdtMetadataCache.get(cacheKey);
+  }
+  let metadata;
+  switch (nodeType) {
+    case "fieldAnnotation":
+      metadata = normalizeFieldAnnotationMetadata(normalizedAttrs);
+      break;
+    case "structuredContent":
+    case "structuredContentBlock":
+      metadata = normalizeStructuredContentMetadata(nodeType, normalizedAttrs);
+      break;
+    case "documentSection":
+      metadata = normalizeDocumentSectionMetadata(normalizedAttrs);
+      break;
+    case "docPartObject":
+      metadata = normalizeDocPartMetadata(normalizedAttrs);
+      break;
+  }
+  if (metadata && cacheKey) {
+    sdtMetadataCache.set(cacheKey, metadata);
+  }
+  return metadata;
+}
+function createDefaultParagraph(_context) {
+  return {
+    alignment: "left",
+    spacing: {
+      before: 0,
+      after: 0,
+      line: 12,
+      lineRule: "auto"
+    },
+    indent: {
+      left: 0,
+      right: 0,
+      firstLine: 0,
+      hanging: 0
+    },
+    tabs: []
+  };
+}
+function createDefaultCharacter(context) {
+  const baseFont = context.defaults?.paragraphFont ?? "Calibri";
+  const fallback = context.defaults?.paragraphFontFallback;
+  const wordFamily = context.defaults?.paragraphFontFamily;
+  const resolvedFamily = toCssFontFamily(baseFont, { fallback, wordFamily }) ?? baseFont;
+  return {
+    font: {
+      family: resolvedFamily,
+      size: context.defaults?.fontSize ?? 11,
+      weight: 400,
+      italic: false
+    },
+    color: "#000000"
+  };
+}
+function resolveStyleChain(styleId, styles) {
+  if (!styleId || !styles) return [];
+  const result = [];
+  const visited = /* @__PURE__ */ new Set();
+  let current = styles[styleId];
+  while (current && !visited.has(current.id)) {
+    result.unshift(current);
+    visited.add(current.id);
+    current = current.basedOn ? styles[current.basedOn] : void 0;
+  }
+  return result;
+}
+function mergeParagraph(base2, overrides) {
+  if (!overrides) return base2;
+  return {
+    ...base2,
+    alignment: overrides.alignment ?? base2.alignment,
+    spacing: overrides.spacing ? { ...base2.spacing, ...overrides.spacing } : base2.spacing,
+    indent: overrides.indent ? { ...base2.indent, ...overrides.indent } : base2.indent,
+    borders: overrides.borders ? { ...base2.borders, ...overrides.borders } : base2.borders,
+    shading: overrides.shading ?? base2.shading,
+    tabs: overrides.tabs ?? base2.tabs
+  };
+}
+function mergeCharacter(base2, overrides) {
+  if (!overrides) return base2;
+  return {
+    ...base2,
+    font: overrides.font ? { ...base2.font, ...overrides.font } : base2.font,
+    color: overrides.color ?? base2.color,
+    underline: overrides.underline ?? base2.underline,
+    strike: overrides.strike ?? base2.strike,
+    highlight: overrides.highlight ?? base2.highlight,
+    letterSpacing: overrides.letterSpacing ?? base2.letterSpacing
+  };
+}
+function normalizeFieldAnnotationMetadata(attrs) {
+  const fieldId = toOptionalString(attrs.fieldId) ?? "";
+  const formatting = extractFormatting(attrs);
+  const size2 = normalizeSize(attrs.size);
+  const extras = isPlainObject$4(attrs.extras) ? attrs.extras : null;
+  const marks = isPlainObject$4(attrs.marks) ? attrs.marks : void 0;
+  return {
+    type: "fieldAnnotation",
+    fieldId,
+    variant: normalizeFieldAnnotationVariant(attrs.type),
+    fieldType: toOptionalString(attrs.fieldType),
+    displayLabel: toOptionalString(attrs.displayLabel),
+    defaultDisplayLabel: toOptionalString(attrs.defaultDisplayLabel),
+    alias: toOptionalString(attrs.alias),
+    fieldColor: normalizeColorValue(attrs.fieldColor),
+    borderColor: normalizeColorValue(attrs.borderColor),
+    highlighted: toBoolean$3(attrs.highlighted, true),
+    fontFamily: toNullableString(attrs.fontFamily),
+    fontSize: normalizeFontSize(attrs.fontSize),
+    textColor: normalizeColorValue(attrs.textColor) ?? null,
+    textHighlight: normalizeColorValue(attrs.textHighlight) ?? null,
+    linkUrl: toNullableString(attrs.linkUrl),
+    imageSrc: toNullableString(attrs.imageSrc),
+    rawHtml: attrs.rawHtml ?? void 0,
+    size: size2 ?? null,
+    extras,
+    multipleImage: toBoolean$3(attrs.multipleImage, false),
+    hash: toOptionalString(attrs.hash) ?? null,
+    generatorIndex: toNumber(attrs.generatorIndex),
+    sdtId: toOptionalString(attrs.sdtId) ?? null,
+    hidden: toBoolean$3(attrs.hidden, false),
+    visibility: normalizeVisibility(attrs.visibility),
+    isLocked: toBoolean$3(attrs.isLocked, false),
+    formatting,
+    marks
+  };
+}
+function normalizeStructuredContentMetadata(nodeType, attrs) {
+  return {
+    type: "structuredContent",
+    scope: nodeType === "structuredContentBlock" ? "block" : "inline",
+    id: toNullableString(attrs.id),
+    tag: toOptionalString(attrs.tag),
+    alias: toOptionalString(attrs.alias),
+    sdtPr: attrs.sdtPr
+  };
+}
+function normalizeDocumentSectionMetadata(attrs) {
+  return {
+    type: "documentSection",
+    id: toNullableString(attrs.id),
+    title: toOptionalString(attrs.title) ?? null,
+    description: toOptionalString(attrs.description) ?? null,
+    sectionType: toOptionalString(attrs.sectionType) ?? null,
+    isLocked: toBoolean$3(attrs.isLocked, false),
+    sdBlockId: toNullableString(attrs.sdBlockId)
+  };
+}
+function normalizeDocPartMetadata(attrs) {
+  return {
+    type: "docPartObject",
+    gallery: toOptionalString(attrs.docPartGallery ?? attrs.gallery) ?? null,
+    // Source uniqueId from attrs.id (PM adapter uses getDocPartObjectId which extracts attrs.id)
+    // Fall back to attrs.uniqueId for compatibility
+    uniqueId: toOptionalString(attrs.id ?? attrs.uniqueId) ?? null,
+    alias: toOptionalString(attrs.alias) ?? null,
+    instruction: toOptionalString(attrs.instruction) ?? null
+  };
+}
+function isPlainObject$4(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function toOptionalString(value) {
+  if (value == null) return void 0;
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    return trimmed.length ? trimmed : void 0;
+  }
+  return String(value);
+}
+function toNullableString(value) {
+  const str = toOptionalString(value);
+  return str ?? null;
+}
+function toBoolean$3(value, fallback) {
+  if (typeof value === "boolean") return value;
+  if (typeof value === "string") {
+    const lower = value.toLowerCase();
+    if (lower === "true") return true;
+    if (lower === "false") return false;
+  }
+  if (value == null) return fallback;
+  return Boolean(value);
+}
+function normalizeVisibility(value) {
+  if (typeof value !== "string") return void 0;
+  const normalized = value.toLowerCase();
+  if (normalized === "visible" || normalized === "hidden") {
+    return normalized;
+  }
+  return void 0;
+}
+function normalizeColorValue(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  if (!trimmed || trimmed.toLowerCase() === "none") return void 0;
+  return trimmed;
+}
+function normalizeFontSize(value) {
+  if (value == null) return null;
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : null;
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    return trimmed.length ? trimmed : null;
+  }
+  return null;
+}
+function toNumber(value) {
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : null;
+  }
+  if (typeof value === "string") {
+    const parsed = parseFloat(value);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+function normalizeSize(value) {
+  if (!isPlainObject$4(value)) return null;
+  const obj = value;
+  const width = toNumber(obj.width);
+  const height = toNumber(obj.height);
+  if (width == null && height == null) return null;
+  const result = {};
+  if (width != null) result.width = width;
+  if (height != null) result.height = height;
+  return result;
+}
+function normalizeFieldAnnotationVariant(value) {
+  if (typeof value !== "string") return void 0;
+  const normalized = value.toLowerCase();
+  if (normalized === "text" || normalized === "image" || normalized === "signature" || normalized === "checkbox" || normalized === "html" || normalized === "link") {
+    return normalized;
+  }
+  return void 0;
+}
+function extractFormatting(attrs) {
+  const bold = toBoolean$3(attrs.bold, false);
+  const italic = toBoolean$3(attrs.italic, false);
+  const underline = toBoolean$3(attrs.underline, false);
+  const formatting = {};
+  if (bold) formatting.bold = true;
+  if (italic) formatting.italic = true;
+  if (underline) formatting.underline = true;
+  return Object.keys(formatting).length ? formatting : void 0;
+}
+function buildSdtCacheKey(nodeType, attrs, explicitKey) {
+  const provided = toOptionalString(explicitKey);
+  if (provided) {
+    return `${nodeType}:${provided}`;
+  }
+  const hash2 = toOptionalString(attrs.hash);
+  if (hash2) {
+    return `${nodeType}:${hash2}`;
+  }
+  const id = toOptionalString(attrs.id);
+  if (id) {
+    return `${nodeType}:${id}`;
+  }
+  return void 0;
+}
 function createDocument(converter, schema, editor, { check = false } = {}) {
   const documentData = converter.getSchema(editor);
   if (documentData) {
@@ -9108,15 +9456,19 @@ const splitRunToParagraph = () => (props) => {
     dispatchTransaction = editor.dispatch.bind(editor);
   }
   if (!dispatchTransaction) return false;
-  const handled = splitBlockPatch(state, (transaction) => {
-    dispatchTransaction(transaction);
-  });
+  const handled = splitBlockPatch(
+    state,
+    (transaction) => {
+      dispatchTransaction(transaction);
+    },
+    editor
+  );
   if (handled) {
     tr.setMeta("preventDispatch", true);
   }
   return handled;
 };
-function splitBlockPatch(state, dispatch) {
+function splitBlockPatch(state, dispatch, editor) {
   let { $from } = state.selection;
   if (state.selection instanceof superEditor_converter.NodeSelection && state.selection.node.isBlock) {
     if (!$from.parentOffset || !superEditor_converter.canSplit(state.doc, $from.pos)) return false;
@@ -9125,14 +9477,15 @@ function splitBlockPatch(state, dispatch) {
   }
   if (!$from.depth) return false;
   let types = [];
-  let splitDepth, deflt, atEnd = false, atStart = false;
+  let splitDepth, deflt, paragraphAttrs = null, atEnd = false, atStart = false;
   for (let d2 = $from.depth; ; d2--) {
     let node = $from.node(d2);
     if (node.isBlock) {
       atEnd = $from.end(d2) == $from.pos + ($from.depth - d2);
       atStart = $from.start(d2) == $from.pos - ($from.depth - d2);
       deflt = defaultBlockAt$1($from.node(d2 - 1).contentMatchAt($from.indexAfter(d2 - 1)));
-      types.unshift(null);
+      paragraphAttrs = { ...node.attrs };
+      types.unshift({ type: deflt || node.type, attrs: paragraphAttrs });
       splitDepth = d2;
       break;
     } else {
@@ -9145,7 +9498,7 @@ function splitBlockPatch(state, dispatch) {
   let splitPos = tr.mapping.map($from.pos);
   let can = superEditor_converter.canSplit(tr.doc, splitPos, types.length, types);
   if (!can) {
-    types[0] = deflt ? { type: deflt } : null;
+    types[0] = deflt ? { type: deflt, attrs: paragraphAttrs } : null;
     can = superEditor_converter.canSplit(tr.doc, splitPos, types.length, types);
   }
   if (!can) return false;
@@ -9155,9 +9508,37 @@ function splitBlockPatch(state, dispatch) {
     if (deflt && $from.node(splitDepth - 1).canReplaceWith($first.index(), $first.index() + 1, deflt))
       tr.setNodeMarkup(tr.mapping.map($from.before(splitDepth)), deflt);
   }
+  applyStyleMarks(state, tr, editor, paragraphAttrs);
   if (dispatch) dispatch(tr.scrollIntoView());
   return true;
 }
+function applyStyleMarks(state, tr, editor, paragraphAttrs) {
+  const styleId = paragraphAttrs?.paragraphProperties?.styleId;
+  if (!editor?.converter && !styleId) {
+    return;
+  }
+  try {
+    const params2 = { docx: editor?.converter?.convertedXml ?? {}, numbering: editor?.converter?.numbering ?? {} };
+    const resolvedPpr = styleId ? { styleId } : {};
+    const runProperties = styleId ? superEditor_converter.resolveRunProperties(params2, {}, resolvedPpr, false, false) : {};
+    const markDefsFromStyle = styleId ? (
+      /** @type {Array<{type: string, attrs: Record<string, unknown>}>} */
+      superEditor_converter.encodeMarksFromRPr(runProperties, editor?.converter?.convertedXml ?? {})
+    ) : [];
+    const selectionMarks = state.selection?.$from?.marks ? state.selection.$from.marks() : [];
+    const selectionMarkDefs = selectionMarks.map((mark) => ({ type: mark.type.name, attrs: mark.attrs }));
+    const markDefsToApply = selectionMarks.length ? selectionMarkDefs : markDefsFromStyle;
+    const marksToApply = markDefsToApply.map((def) => {
+      const markType = state.schema.marks[def.type];
+      return markType ? markType.create(def.attrs) : null;
+    }).filter(Boolean);
+    if (marksToApply.length > 0) {
+      tr.ensureMarks(marksToApply);
+      tr.setMeta("sdStyleMarks", markDefsToApply);
+    }
+  } catch {
+  }
+}
 const splitRunAtCursor = () => (props) => {
   let { state, dispatch, tr } = props;
   const sel = state.selection;
@@ -10041,7 +10422,7 @@ const updateAttributes = (typeOrName, attrs = {}) => ({ tr, state, dispatch }) =
   }
   return true;
 };
-const isPlainObject$4 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+const isPlainObject$3 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 const assignNestedValue = (target, path, value) => {
   if (!path.includes(".")) {
     target[path] = value;
@@ -10055,7 +10436,7 @@ const assignNestedValue = (target, path, value) => {
     if (isLast) {
       current[part] = value;
     } else {
-      if (!isPlainObject$4(current[part])) {
+      if (!isPlainObject$3(current[part])) {
         current[part] = {};
       }
       current = current[part];
@@ -13028,8 +13409,12 @@ const createOrUpdateTrackedChangeComment = ({ event, marks, deletionNodes, nodes
     const hasMatchingId = changeMarks.find((mark) => mark.attrs.id === id);
     if (hasMatchingId) nodesWithMark.push(node2);
   });
+  const nodesToProcess = nodesWithMark.length ? nodesWithMark : node ? [node] : [];
+  if (!nodesToProcess.length) {
+    return;
+  }
   const { deletionText, trackedChangeText } = getTrackedChangeText({
-    nodes: nodesWithMark.length ? nodesWithMark : [node],
+    nodes: nodesToProcess,
     mark: trackedMark,
     trackedChangeType,
     isDeletionInsertion
@@ -13745,6 +14130,45 @@ const updateYdocDocxData = async (editor, ydoc) => {
     console.warn("[collaboration] Failed to update Ydoc docx data", error);
   }
 };
+let isApplyingRemoteChanges = false;
+const isApplyingRemoteHeaderFooterChanges = () => isApplyingRemoteChanges;
+const pushHeaderFooterToYjs = (editor, type, sectionId, content) => {
+  if (isApplyingRemoteChanges) return;
+  const ydoc = editor?.options?.ydoc;
+  if (!ydoc) return;
+  const headerFooterMap = ydoc.getMap("headerFooterJson");
+  const key2 = `${type}:${sectionId}`;
+  const existing = headerFooterMap.get(key2)?.content;
+  if (existing && JSON.stringify(existing) === JSON.stringify(content)) {
+    return;
+  }
+  ydoc.transact(() => headerFooterMap.set(key2, { type, sectionId, content }), {
+    event: "header-footer-update",
+    user: editor.options.user
+  });
+};
+const applyRemoteHeaderFooterChanges = (editor, key2, data) => {
+  if (!editor || editor.isDestroyed || !editor.converter) return;
+  const { type, sectionId, content } = data;
+  if (!type || !sectionId || !content) return;
+  isApplyingRemoteChanges = true;
+  try {
+    const storage = editor.converter[`${type}s`];
+    if (storage) storage[sectionId] = content;
+    editor.converter.headerFooterModified = true;
+    const editors = editor.converter[`${type}Editors`];
+    editors?.forEach((item) => {
+      if (item.id === sectionId && item.editor) {
+        item.editor.replaceContent(content);
+      }
+    });
+    editor.emit("remoteHeaderFooterChanged", { type, sectionId, content });
+  } finally {
+    setTimeout(() => {
+      isApplyingRemoteChanges = false;
+    }, 0);
+  }
+};
 new superEditor_converter.PluginKey("collaboration");
 const Collaboration = Extension.create({
   name: "collaboration",
@@ -13773,6 +14197,18 @@ const Collaboration = Extension.create({
         }
       });
     });
+    const headerFooterMap = this.options.ydoc.getMap("headerFooterJson");
+    headerFooterMap.observe((event) => {
+      if (event.transaction.local) return;
+      event.changes.keys.forEach((change, key2) => {
+        if (change.action === "add" || change.action === "update") {
+          const data = headerFooterMap.get(key2);
+          if (data) {
+            applyRemoteHeaderFooterChanges(this.editor, key2, data);
+          }
+        }
+      });
+    });
     return [syncPlugin];
   },
   addCommands() {
@@ -14915,7 +15351,7 @@ const canUseDOM = () => {
     return false;
   }
 };
-const summaryVersion = "1.3.0-next.2";
+const summaryVersion = "1.3.0-next.4";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -17548,7 +17984,7 @@ class Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.2");
+    console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.4");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -23123,39 +23559,6 @@ const resolveTableCellBorders = (tableBorders, rowIndex, colIndex, totalRows, to
     right: borderValueToSpec(isLastCol ? tableBorders?.right : null)
   };
 };
-const FONT_FAMILY_FALLBACKS = Object.freeze({
-  swiss: "Arial, sans-serif",
-  roman: "Times New Roman, serif",
-  modern: "Courier New, monospace",
-  script: "cursive",
-  decorative: "fantasy",
-  system: "system-ui",
-  auto: "sans-serif"
-});
-const DEFAULT_GENERIC_FALLBACK = "sans-serif";
-const normalizeParts = (value) => (value || "").split(",").map((part) => part.trim()).filter(Boolean);
-function mapWordFamilyFallback(wordFamily) {
-  if (!wordFamily) return DEFAULT_GENERIC_FALLBACK;
-  const mapped = FONT_FAMILY_FALLBACKS[wordFamily.toLowerCase()];
-  return mapped || DEFAULT_GENERIC_FALLBACK;
-}
-function toCssFontFamily(fontName, options = {}) {
-  if (!fontName || typeof fontName !== "string") return fontName;
-  const trimmed = fontName.trim();
-  if (!trimmed || trimmed.includes(",")) return trimmed;
-  const { fallback, wordFamily } = options;
-  const fallbackValue = fallback ?? (wordFamily ? mapWordFamilyFallback(wordFamily) : void 0) ?? DEFAULT_GENERIC_FALLBACK;
-  const fallbackParts = normalizeParts(fallbackValue);
-  if (fallbackParts.length === 0) {
-    return trimmed;
-  }
-  const normalizedName = trimmed.toLowerCase();
-  const includesName = fallbackParts.some((part) => part.toLowerCase() === normalizedName);
-  if (includesName) {
-    return fallbackParts.join(", ");
-  }
-  return [trimmed, ...fallbackParts].join(", ");
-}
 const LIST_MARKER_GAP$3 = 8;
 function renderListMarker(params2) {
   const { doc: doc2, lineEl, markerLayout, markerMeasure, indentLeftPx } = params2;
@@ -27158,7 +27561,12 @@ class DomPainter {
       const hanging = paraIndent?.hanging ?? 0;
       const isFirstLineOfPara = lineIndex === 0 || lineIndex === void 0;
       const firstLineOffsetForCumX = isFirstLineOfPara ? firstLine - hanging : 0;
-      const indentOffset = indentLeft + firstLineOffsetForCumX;
+      const wordLayoutValue = block.attrs?.wordLayout;
+      const wordLayout = isMinimalWordLayout(wordLayoutValue) ? wordLayoutValue : void 0;
+      const isListParagraph = Boolean(wordLayout?.marker);
+      const rawTextStartPx = typeof wordLayout?.marker?.textStartX === "number" && Number.isFinite(wordLayout.marker.textStartX) ? wordLayout.marker.textStartX : typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
+      const listIndentOffset = isFirstLineOfPara ? rawTextStartPx ?? indentLeft : indentLeft;
+      const indentOffset = isListParagraph ? listIndentOffset : indentLeft + firstLineOffsetForCumX;
       let cumulativeX = 0;
       const segmentsByRun = /* @__PURE__ */ new Map();
       line.segments.forEach((segment) => {
@@ -39719,8 +40127,17 @@ const pxToPt = (px) => {
   if (px == null || !Number.isFinite(px)) return void 0;
   return px / PX_PER_PT;
 };
+const convertIndentTwipsToPx$1 = (indent) => {
+  if (!indent) return void 0;
+  const result = {};
+  if (isFiniteNumber(indent.left)) result.left = twipsToPx$1(indent.left);
+  if (isFiniteNumber(indent.right)) result.right = twipsToPx$1(indent.right);
+  if (isFiniteNumber(indent.firstLine)) result.firstLine = twipsToPx$1(indent.firstLine);
+  if (isFiniteNumber(indent.hanging)) result.hanging = twipsToPx$1(indent.hanging);
+  return Object.keys(result).length ? result : void 0;
+};
 const isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
-const isPlainObject$3 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+const isPlainObject$2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 const normalizePrefix = (value) => {
   if (!value) return "";
   return String(value);
@@ -39782,7 +40199,7 @@ function coerceBoolean(value) {
   }
   return void 0;
 }
-const toBoolean$3 = (value) => {
+const toBoolean$2 = (value) => {
   if (typeof value === "boolean") return value;
   if (typeof value === "string") {
     const v = value.trim().toLowerCase();
@@ -40073,7 +40490,7 @@ function hydrateImageBlocks(blocks, mediaFiles) {
   });
 }
 function isGradientFill(value) {
-  if (!isPlainObject$3(value)) return false;
+  if (!isPlainObject$2(value)) return false;
   if (value.type !== "gradient") return false;
   const gradientType = value.gradientType;
   if (gradientType !== "linear" && gradientType !== "radial") return false;
@@ -40084,12 +40501,12 @@ function isGradientFill(value) {
   }
   if (!Array.isArray(value.stops) || value.stops.length === 0) return false;
   return value.stops.every((stop) => {
-    if (!isPlainObject$3(stop)) return false;
+    if (!isPlainObject$2(stop)) return false;
     return typeof stop.position === "number" && Number.isFinite(stop.position) && typeof stop.color === "string" && (stop.alpha === void 0 || typeof stop.alpha === "number" && Number.isFinite(stop.alpha));
   });
 }
 function isSolidFillWithAlpha(value) {
-  return isPlainObject$3(value) && value.type === "solidWithAlpha" && typeof value.color === "string" && typeof value.alpha === "number";
+  return isPlainObject$2(value) && value.type === "solidWithAlpha" && typeof value.color === "string" && typeof value.alpha === "number";
 }
 function normalizeFillColor(value) {
   if (value === null) return null;
@@ -40104,10 +40521,10 @@ function normalizeStrokeColor(value) {
   return void 0;
 }
 function normalizeTextContent(value) {
-  if (!isPlainObject$3(value)) return void 0;
+  if (!isPlainObject$2(value)) return void 0;
   if (!Array.isArray(value.parts)) return void 0;
   if (value.parts.length === 0) return void 0;
-  const validParts = value.parts.filter((p) => isPlainObject$3(p) && typeof p.text === "string");
+  const validParts = value.parts.filter((p) => isPlainObject$2(p) && typeof p.text === "string");
   if (validParts.length === 0) return void 0;
   const result = {
     parts: validParts
@@ -40125,7 +40542,7 @@ function normalizeTextVerticalAlign(value) {
   return void 0;
 }
 function normalizeTextInsets(value) {
-  if (!isPlainObject$3(value)) return void 0;
+  if (!isPlainObject$2(value)) return void 0;
   const top2 = pickNumber(value.top);
   const right2 = pickNumber(value.right);
   const bottom2 = pickNumber(value.bottom);
@@ -40137,7 +40554,7 @@ function normalizeTextInsets(value) {
 }
 const OOXML_Z_INDEX_BASE = 251658240;
 function normalizeZIndex(originalAttributes) {
-  if (!isPlainObject$3(originalAttributes)) return void 0;
+  if (!isPlainObject$2(originalAttributes)) return void 0;
   const relativeHeight = originalAttributes.relativeHeight;
   if (typeof relativeHeight !== "number") return void 0;
   return Math.max(0, relativeHeight - OOXML_Z_INDEX_BASE);
@@ -41331,321 +41748,6 @@ const ensureBidiIndentPx = (indent) => {
   }
   return adjusted;
 };
-const sdtMetadataCache = /* @__PURE__ */ new Map();
-function resolveStyle(node, context, options = {}) {
-  let paragraph = createDefaultParagraph();
-  let character = createDefaultCharacter(context);
-  let numbering;
-  const chain = resolveStyleChain(node.styleId, context.styles);
-  for (const style2 of chain) {
-    paragraph = mergeParagraph(paragraph, style2.paragraph);
-    character = mergeCharacter(character, style2.character);
-    if (!numbering && style2.numbering) {
-      numbering = resolveNumbering(style2.numbering.numId, style2.numbering.level, context);
-    }
-  }
-  paragraph = mergeParagraph(paragraph, node.paragraphProps);
-  character = mergeCharacter(character, node.characterProps);
-  if (node.numbering) {
-    numbering = resolveNumbering(node.numbering.numId, node.numbering.level, context);
-  }
-  const sdt = options?.sdt ? resolveSdtMetadata(options.sdt) : void 0;
-  return {
-    paragraph,
-    character,
-    numbering,
-    sdt
-  };
-}
-function resolveNumbering(numId, level, context) {
-  const def = context.numbering?.[numId];
-  if (!def) return void 0;
-  const levelDef = def.levels.find((entry) => entry.level === level) ?? def.levels[level];
-  if (!levelDef) return void 0;
-  return {
-    numId,
-    level,
-    indent: {
-      left: levelDef.indent?.left,
-      hanging: levelDef.indent?.hanging
-    },
-    format: levelDef.format ?? "decimal",
-    text: levelDef.text ?? "%1.",
-    start: levelDef.start ?? 1
-  };
-}
-function resolveSdtMetadata(input) {
-  if (!input) return void 0;
-  const { nodeType, attrs, cacheKey: explicitKey } = input;
-  if (!nodeType) return void 0;
-  const normalizedAttrs = isPlainObject$2(attrs) ? attrs : {};
-  const cacheKey = buildSdtCacheKey(nodeType, normalizedAttrs, explicitKey);
-  if (cacheKey && sdtMetadataCache.has(cacheKey)) {
-    return sdtMetadataCache.get(cacheKey);
-  }
-  let metadata;
-  switch (nodeType) {
-    case "fieldAnnotation":
-      metadata = normalizeFieldAnnotationMetadata(normalizedAttrs);
-      break;
-    case "structuredContent":
-    case "structuredContentBlock":
-      metadata = normalizeStructuredContentMetadata(nodeType, normalizedAttrs);
-      break;
-    case "documentSection":
-      metadata = normalizeDocumentSectionMetadata(normalizedAttrs);
-      break;
-    case "docPartObject":
-      metadata = normalizeDocPartMetadata(normalizedAttrs);
-      break;
-  }
-  if (metadata && cacheKey) {
-    sdtMetadataCache.set(cacheKey, metadata);
-  }
-  return metadata;
-}
-function createDefaultParagraph(_context) {
-  return {
-    alignment: "left",
-    spacing: {
-      before: 0,
-      after: 0,
-      line: 12,
-      lineRule: "auto"
-    },
-    indent: {
-      left: 0,
-      right: 0,
-      firstLine: 0,
-      hanging: 0
-    },
-    tabs: []
-  };
-}
-function createDefaultCharacter(context) {
-  const baseFont = context.defaults?.paragraphFont ?? "Calibri";
-  const fallback = context.defaults?.paragraphFontFallback;
-  const wordFamily = context.defaults?.paragraphFontFamily;
-  const resolvedFamily = toCssFontFamily(baseFont, { fallback, wordFamily }) ?? baseFont;
-  return {
-    font: {
-      family: resolvedFamily,
-      size: context.defaults?.fontSize ?? 11,
-      weight: 400,
-      italic: false
-    },
-    color: "#000000"
-  };
-}
-function resolveStyleChain(styleId, styles) {
-  if (!styleId || !styles) return [];
-  const result = [];
-  const visited = /* @__PURE__ */ new Set();
-  let current = styles[styleId];
-  while (current && !visited.has(current.id)) {
-    result.unshift(current);
-    visited.add(current.id);
-    current = current.basedOn ? styles[current.basedOn] : void 0;
-  }
-  return result;
-}
-function mergeParagraph(base2, overrides) {
-  if (!overrides) return base2;
-  return {
-    ...base2,
-    alignment: overrides.alignment ?? base2.alignment,
-    spacing: overrides.spacing ? { ...base2.spacing, ...overrides.spacing } : base2.spacing,
-    indent: overrides.indent ? { ...base2.indent, ...overrides.indent } : base2.indent,
-    borders: overrides.borders ? { ...base2.borders, ...overrides.borders } : base2.borders,
-    shading: overrides.shading ?? base2.shading,
-    tabs: overrides.tabs ?? base2.tabs
-  };
-}
-function mergeCharacter(base2, overrides) {
-  if (!overrides) return base2;
-  return {
-    ...base2,
-    font: overrides.font ? { ...base2.font, ...overrides.font } : base2.font,
-    color: overrides.color ?? base2.color,
-    underline: overrides.underline ?? base2.underline,
-    strike: overrides.strike ?? base2.strike,
-    highlight: overrides.highlight ?? base2.highlight,
-    letterSpacing: overrides.letterSpacing ?? base2.letterSpacing
-  };
-}
-function normalizeFieldAnnotationMetadata(attrs) {
-  const fieldId = toOptionalString(attrs.fieldId) ?? "";
-  const formatting = extractFormatting(attrs);
-  const size2 = normalizeSize(attrs.size);
-  const extras = isPlainObject$2(attrs.extras) ? attrs.extras : null;
-  const marks = isPlainObject$2(attrs.marks) ? attrs.marks : void 0;
-  return {
-    type: "fieldAnnotation",
-    fieldId,
-    variant: normalizeFieldAnnotationVariant(attrs.type),
-    fieldType: toOptionalString(attrs.fieldType),
-    displayLabel: toOptionalString(attrs.displayLabel),
-    defaultDisplayLabel: toOptionalString(attrs.defaultDisplayLabel),
-    alias: toOptionalString(attrs.alias),
-    fieldColor: normalizeColorValue(attrs.fieldColor),
-    borderColor: normalizeColorValue(attrs.borderColor),
-    highlighted: toBoolean$2(attrs.highlighted, true),
-    fontFamily: toNullableString(attrs.fontFamily),
-    fontSize: normalizeFontSize(attrs.fontSize),
-    textColor: normalizeColorValue(attrs.textColor) ?? null,
-    textHighlight: normalizeColorValue(attrs.textHighlight) ?? null,
-    linkUrl: toNullableString(attrs.linkUrl),
-    imageSrc: toNullableString(attrs.imageSrc),
-    rawHtml: attrs.rawHtml ?? void 0,
-    size: size2 ?? null,
-    extras,
-    multipleImage: toBoolean$2(attrs.multipleImage, false),
-    hash: toOptionalString(attrs.hash) ?? null,
-    generatorIndex: toNumber(attrs.generatorIndex),
-    sdtId: toOptionalString(attrs.sdtId) ?? null,
-    hidden: toBoolean$2(attrs.hidden, false),
-    visibility: normalizeVisibility(attrs.visibility),
-    isLocked: toBoolean$2(attrs.isLocked, false),
-    formatting,
-    marks
-  };
-}
-function normalizeStructuredContentMetadata(nodeType, attrs) {
-  return {
-    type: "structuredContent",
-    scope: nodeType === "structuredContentBlock" ? "block" : "inline",
-    id: toNullableString(attrs.id),
-    tag: toOptionalString(attrs.tag),
-    alias: toOptionalString(attrs.alias),
-    sdtPr: attrs.sdtPr
-  };
-}
-function normalizeDocumentSectionMetadata(attrs) {
-  return {
-    type: "documentSection",
-    id: toNullableString(attrs.id),
-    title: toOptionalString(attrs.title) ?? null,
-    description: toOptionalString(attrs.description) ?? null,
-    sectionType: toOptionalString(attrs.sectionType) ?? null,
-    isLocked: toBoolean$2(attrs.isLocked, false),
-    sdBlockId: toNullableString(attrs.sdBlockId)
-  };
-}
-function normalizeDocPartMetadata(attrs) {
-  return {
-    type: "docPartObject",
-    gallery: toOptionalString(attrs.docPartGallery ?? attrs.gallery) ?? null,
-    // Source uniqueId from attrs.id (PM adapter uses getDocPartObjectId which extracts attrs.id)
-    // Fall back to attrs.uniqueId for compatibility
-    uniqueId: toOptionalString(attrs.id ?? attrs.uniqueId) ?? null,
-    alias: toOptionalString(attrs.alias) ?? null,
-    instruction: toOptionalString(attrs.instruction) ?? null
-  };
-}
-function isPlainObject$2(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function toOptionalString(value) {
-  if (value == null) return void 0;
-  if (typeof value === "string") {
-    const trimmed = value.trim();
-    return trimmed.length ? trimmed : void 0;
-  }
-  return String(value);
-}
-function toNullableString(value) {
-  const str = toOptionalString(value);
-  return str ?? null;
-}
-function toBoolean$2(value, fallback) {
-  if (typeof value === "boolean") return value;
-  if (typeof value === "string") {
-    const lower = value.toLowerCase();
-    if (lower === "true") return true;
-    if (lower === "false") return false;
-  }
-  if (value == null) return fallback;
-  return Boolean(value);
-}
-function normalizeVisibility(value) {
-  if (typeof value !== "string") return void 0;
-  const normalized = value.toLowerCase();
-  if (normalized === "visible" || normalized === "hidden") {
-    return normalized;
-  }
-  return void 0;
-}
-function normalizeColorValue(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  if (!trimmed || trimmed.toLowerCase() === "none") return void 0;
-  return trimmed;
-}
-function normalizeFontSize(value) {
-  if (value == null) return null;
-  if (typeof value === "number") {
-    return Number.isFinite(value) ? value : null;
-  }
-  if (typeof value === "string") {
-    const trimmed = value.trim();
-    return trimmed.length ? trimmed : null;
-  }
-  return null;
-}
-function toNumber(value) {
-  if (typeof value === "number") {
-    return Number.isFinite(value) ? value : null;
-  }
-  if (typeof value === "string") {
-    const parsed = parseFloat(value);
-    return Number.isFinite(parsed) ? parsed : null;
-  }
-  return null;
-}
-function normalizeSize(value) {
-  if (!isPlainObject$2(value)) return null;
-  const obj = value;
-  const width = toNumber(obj.width);
-  const height = toNumber(obj.height);
-  if (width == null && height == null) return null;
-  const result = {};
-  if (width != null) result.width = width;
-  if (height != null) result.height = height;
-  return result;
-}
-function normalizeFieldAnnotationVariant(value) {
-  if (typeof value !== "string") return void 0;
-  const normalized = value.toLowerCase();
-  if (normalized === "text" || normalized === "image" || normalized === "signature" || normalized === "checkbox" || normalized === "html" || normalized === "link") {
-    return normalized;
-  }
-  return void 0;
-}
-function extractFormatting(attrs) {
-  const bold = toBoolean$2(attrs.bold, false);
-  const italic = toBoolean$2(attrs.italic, false);
-  const underline = toBoolean$2(attrs.underline, false);
-  const formatting = {};
-  if (bold) formatting.bold = true;
-  if (italic) formatting.italic = true;
-  if (underline) formatting.underline = true;
-  return Object.keys(formatting).length ? formatting : void 0;
-}
-function buildSdtCacheKey(nodeType, attrs, explicitKey) {
-  const provided = toOptionalString(explicitKey);
-  if (provided) {
-    return `${nodeType}:${provided}`;
-  }
-  const hash2 = toOptionalString(attrs.hash);
-  if (hash2) {
-    return `${nodeType}:${hash2}`;
-  }
-  const id = toOptionalString(attrs.id);
-  if (id) {
-    return `${nodeType}:${id}`;
-  }
-  return void 0;
-}
 const DEFAULT_LIST_HANGING_PX = 18;
 const LIST_MARKER_GAP = 8;
 const DEFAULT_BULLET_GLYPH = "•";
@@ -42205,6 +42307,7 @@ const EMPTY_NUMBERING_CONTEXT = {
   definitions: {},
   abstracts: {}
 };
+const ooxmlResolver = superEditor_converter.createOoxmlResolver({ pPr: superEditor_converter.translator, rPr: superEditor_converter.translator$1 });
 const hydrateParagraphStyleAttrs = (para, context, preResolved) => {
   if (!hasParagraphStyleContext(context)) {
     return null;
@@ -42232,7 +42335,7 @@ const hydrateParagraphStyleAttrs = (para, context, preResolved) => {
     // should still get docDefaults spacing from style resolution
     numbering: context.numbering ?? EMPTY_NUMBERING_CONTEXT
   };
-  const resolved = superEditor_converter.resolveParagraphProperties(resolverParams, inlineProps);
+  const resolved = ooxmlResolver.resolveParagraphProperties(resolverParams, inlineProps);
   if (!resolved) {
     return null;
   }
@@ -42287,6 +42390,138 @@ const cloneIfObject = (value) => {
   }
   return { ...value };
 };
+const buildCharacterStyleHydration = (resolved, docx) => {
+  const fontFamily2 = extractFontFamily(resolved.fontFamily, docx);
+  const fontSize2 = typeof resolved.fontSize === "number" ? resolved.fontSize : 20;
+  const color = extractColorValue(resolved.color);
+  const bold = normalizeBooleanProp(resolved.bold);
+  const italic = normalizeBooleanProp(resolved.italic);
+  const strike = normalizeBooleanProp(resolved.strike);
+  const underline = extractUnderline(resolved.underline);
+  const letterSpacing = typeof resolved.letterSpacing === "number" ? resolved.letterSpacing : void 0;
+  return {
+    fontFamily: fontFamily2,
+    fontSize: fontSize2,
+    color,
+    bold,
+    italic,
+    strike,
+    underline,
+    letterSpacing
+  };
+};
+const hydrateCharacterStyleAttrs = (para, context, resolvedPpr) => {
+  if (!hasParagraphStyleContext(context)) {
+    return null;
+  }
+  const attrs = para.attrs ?? {};
+  const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
+  const styleIdSource = attrs.styleId ?? paragraphProps.styleId;
+  const styleId = typeof styleIdSource === "string" && styleIdSource.trim() ? styleIdSource : null;
+  const inlineRpr = {};
+  const pprForChain = resolvedPpr ?? { styleId };
+  const numberingProps = attrs.numberingProperties ?? paragraphProps.numberingProperties;
+  if (numberingProps != null) {
+    pprForChain.numberingProperties = numberingProps;
+  }
+  const resolverParams = {
+    docx: context.docx,
+    numbering: context.numbering ?? EMPTY_NUMBERING_CONTEXT
+  };
+  let resolved = null;
+  try {
+    resolved = ooxmlResolver.resolveRunProperties(
+      resolverParams,
+      inlineRpr,
+      pprForChain,
+      false,
+      // not list number marker
+      false
+      // not numberingDefinedInline
+    );
+    if (!resolved || typeof resolved !== "object") {
+      return null;
+    }
+  } catch {
+    return null;
+  }
+  return buildCharacterStyleHydration(resolved, context.docx);
+};
+const hydrateMarkerStyleAttrs = (para, context, resolvedPpr) => {
+  if (!hasParagraphStyleContext(context)) {
+    return null;
+  }
+  const attrs = para.attrs ?? {};
+  const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
+  const styleIdSource = attrs.styleId ?? paragraphProps.styleId;
+  const styleId = typeof styleIdSource === "string" && styleIdSource.trim() ? styleIdSource : null;
+  const inlineRpr = {};
+  const numberingProps = attrs.numberingProperties ?? paragraphProps.numberingProperties;
+  const numberingDefinedInline = numberingProps?.numId != null;
+  const pprForChain = resolvedPpr ? { ...resolvedPpr } : { styleId };
+  if (styleId && !pprForChain.styleId) {
+    pprForChain.styleId = styleId;
+  }
+  if (numberingProps != null) {
+    pprForChain.numberingProperties = numberingProps;
+  }
+  const resolverParams = {
+    docx: context.docx,
+    numbering: context.numbering ?? EMPTY_NUMBERING_CONTEXT
+  };
+  let resolved = null;
+  try {
+    resolved = ooxmlResolver.resolveRunProperties(
+      resolverParams,
+      inlineRpr,
+      pprForChain,
+      true,
+      numberingDefinedInline
+    );
+    if (!resolved || typeof resolved !== "object") {
+      return null;
+    }
+  } catch {
+    return null;
+  }
+  return buildCharacterStyleHydration(resolved, context.docx);
+};
+function extractFontFamily(fontFamily2, docx) {
+  if (!fontFamily2 || typeof fontFamily2 !== "object") return void 0;
+  const toCssFontFamily2 = superEditor_converter.SuperConverter.toCssFontFamily;
+  const resolved = superEditor_converter.resolveDocxFontFamily(fontFamily2, docx ?? null, toCssFontFamily2);
+  return resolved ?? void 0;
+}
+function extractColorValue(color) {
+  if (!color || typeof color !== "object") return void 0;
+  const c2 = color;
+  const val = c2.val;
+  if (typeof val !== "string") return void 0;
+  if (!val || val.toLowerCase() === "auto") return void 0;
+  return val;
+}
+function normalizeBooleanProp(value) {
+  if (value == null) return void 0;
+  if (typeof value === "boolean") return value;
+  if (typeof value === "number") return value !== 0;
+  if (typeof value === "string") {
+    const lower = value.toLowerCase();
+    if (lower === "0" || lower === "false" || lower === "off") return false;
+    if (lower === "1" || lower === "true" || lower === "on" || lower === "") return true;
+  }
+  return Boolean(value);
+}
+function extractUnderline(underline) {
+  if (!underline || typeof underline !== "object") return void 0;
+  const u = underline;
+  const type = u["w:val"] ?? u.type ?? u.val;
+  if (typeof type !== "string" || type === "none") return void 0;
+  const color = u["w:color"] ?? u.color;
+  return {
+    type,
+    color: typeof color === "string" ? color : void 0
+  };
+}
 const { resolveSpacingIndent } = Engines;
 const DEFAULT_DECIMAL_SEPARATOR$2 = ".";
 const isValidNumberingId = (numId) => {
@@ -42802,7 +43037,7 @@ const extractDropCapRunFromParagraph = (para) => {
   }
   return dropCapRun;
 };
-const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleContext, _paragraphNode) => {
+const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleContext, paragraphNode, converterContext, resolvedPpr) => {
   if (numberingProps === null) {
     return null;
   }
@@ -42840,7 +43075,23 @@ const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleCont
         spacing: {}
       }
     };
-    let markerRun = numberingProps?.resolvedMarkerRpr;
+    let markerRun;
+    const markerHydration = paragraphNode && converterContext ? hydrateMarkerStyleAttrs(paragraphNode, converterContext, resolvedPpr) : null;
+    if (markerHydration) {
+      const resolvedColor = markerHydration.color ? `#${markerHydration.color.replace("#", "")}` : void 0;
+      markerRun = {
+        fontFamily: markerHydration.fontFamily ?? "Times New Roman",
+        fontSize: markerHydration.fontSize / 2,
+        // half-points to points
+        bold: markerHydration.bold,
+        italic: markerHydration.italic,
+        color: resolvedColor,
+        letterSpacing: markerHydration.letterSpacing != null ? twipsToPx$1(markerHydration.letterSpacing) : void 0
+      };
+    }
+    if (!markerRun) {
+      markerRun = numberingProps?.resolvedMarkerRpr;
+    }
     if (!markerRun) {
       const { character: characterStyle } = resolveStyle({ styleId: paragraphAttrs.styleId }, styleContext);
       if (characterStyle) {
@@ -42909,8 +43160,11 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   const hydrated = hydrationOverride ?? hydrateParagraphStyleAttrs(para, converterContext);
   const mergedSpacing = mergeSpacingSources(hydrated?.spacing, paragraphProps.spacing, attrs.spacing);
   const normalizedSpacing = normalizeParagraphSpacing(mergedSpacing);
-  const indentSource = attrs.indent ?? paragraphProps.indent ?? hydrated?.indent;
-  const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? attrs.textIndent);
+  const normalizeIndentObject = (value) => {
+    if (!value || typeof value !== "object") return;
+    return normalizePxIndent(value) ?? convertIndentTwipsToPx(value);
+  };
+  const normalizedIndent = normalizeIndentObject(attrs.indent) ?? convertIndentTwipsToPx(paragraphProps.indent) ?? convertIndentTwipsToPx(hydrated?.indent) ?? normalizeParagraphIndent(attrs.textIndent);
   const unwrapTabStops = (tabStops) => {
     if (!Array.isArray(tabStops)) {
       return void 0;
@@ -43161,7 +43415,12 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
     const numId = numberingProps.numId;
     const ilvl = Number.isFinite(numberingProps.ilvl) ? Math.max(0, Math.floor(Number(numberingProps.ilvl))) : 0;
     const numericNumId = typeof numId === "number" ? numId : void 0;
-    const resolvedLevel = resolveNumberingFromContext(numId, ilvl, converterContext?.numbering);
+    let resolvedLevel;
+    try {
+      resolvedLevel = resolveNumberingFromContext(numId, ilvl, converterContext?.numbering);
+    } catch (error) {
+      resolvedLevel = void 0;
+    }
     if (resolvedLevel) {
       if (resolvedLevel.format && numberingProps.format == null) {
         numberingProps.format = resolvedLevel.format;
@@ -43222,7 +43481,19 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
         }
       }
     }
-    let wordLayout = computeWordLayoutForParagraph(paragraphAttrs, enrichedNumberingProps, styleContext);
+    let wordLayout = null;
+    try {
+      wordLayout = computeWordLayoutForParagraph(
+        paragraphAttrs,
+        enrichedNumberingProps,
+        styleContext,
+        para,
+        converterContext,
+        hydrated?.resolved
+      );
+    } catch (error) {
+      wordLayout = null;
+    }
     if (!wordLayout && enrichedNumberingProps.resolvedLevelIndent) {
       const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
       const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
@@ -43767,7 +44038,7 @@ const V_RELATIVE_VALUES$1 = /* @__PURE__ */ new Set(["paragraph", "page", "margi
 const H_ALIGN_VALUES$1 = /* @__PURE__ */ new Set(["left", "center", "right"]);
 const V_ALIGN_VALUES$1 = /* @__PURE__ */ new Set(["top", "center", "bottom"]);
 const getAttrs$1 = (node) => {
-  return isPlainObject$3(node.attrs) ? node.attrs : {};
+  return isPlainObject$2(node.attrs) ? node.attrs : {};
 };
 const normalizeWrapType$1 = (value) => {
   if (typeof value !== "string") return void 0;
@@ -43790,7 +44061,7 @@ const normalizePolygon$1 = (value) => {
   return polygon.length > 0 ? polygon : void 0;
 };
 const normalizeWrap$2 = (value) => {
-  if (!isPlainObject$3(value)) {
+  if (!isPlainObject$2(value)) {
     return void 0;
   }
   const type = normalizeWrapType$1(value.type);
@@ -43798,7 +44069,7 @@ const normalizeWrap$2 = (value) => {
     return void 0;
   }
   const wrap = { type };
-  const attrs = isPlainObject$3(value.attrs) ? value.attrs : {};
+  const attrs = isPlainObject$2(value.attrs) ? value.attrs : {};
   const wrapText = normalizeWrapText$1(attrs.wrapText);
   if (wrapText) {
     wrap.wrapText = wrapText;
@@ -43815,7 +44086,7 @@ const normalizeWrap$2 = (value) => {
   if (polygon) {
     wrap.polygon = polygon;
   }
-  const behindDoc = toBoolean$3(attrs.behindDoc);
+  const behindDoc = toBoolean$2(attrs.behindDoc);
   if (behindDoc != null) {
     wrap.behindDoc = behindDoc;
   }
@@ -43830,10 +44101,10 @@ const normalizeAnchorAlign$1 = (value, allowed) => {
   return allowed.has(value) ? value : void 0;
 };
 const normalizeAnchorData$1 = (value, attrs, wrapBehindDoc) => {
-  const raw = isPlainObject$3(value) ? value : void 0;
-  const marginOffset = isPlainObject$3(attrs.marginOffset) ? attrs.marginOffset : void 0;
-  const simplePos = isPlainObject$3(attrs.simplePos) ? attrs.simplePos : void 0;
-  const originalAttrs = isPlainObject$3(attrs.originalAttributes) ? attrs.originalAttributes : void 0;
+  const raw = isPlainObject$2(value) ? value : void 0;
+  const marginOffset = isPlainObject$2(attrs.marginOffset) ? attrs.marginOffset : void 0;
+  const simplePos = isPlainObject$2(attrs.simplePos) ? attrs.simplePos : void 0;
+  const originalAttrs = isPlainObject$2(attrs.originalAttributes) ? attrs.originalAttributes : void 0;
   const isAnchored = attrs.isAnchor === true || Boolean(raw);
   const anchor = {};
   if (isAnchored) {
@@ -43851,7 +44122,7 @@ const normalizeAnchorData$1 = (value, attrs, wrapBehindDoc) => {
   if (offsetH != null) anchor.offsetH = offsetH;
   const offsetV = pickNumber(marginOffset?.top ?? marginOffset?.vertical ?? raw?.offsetV ?? simplePos?.y);
   if (offsetV != null) anchor.offsetV = offsetV;
-  const behindDoc = toBoolean$3(raw?.behindDoc ?? wrapBehindDoc ?? originalAttrs?.behindDoc);
+  const behindDoc = toBoolean$2(raw?.behindDoc ?? wrapBehindDoc ?? originalAttrs?.behindDoc);
   if (behindDoc != null) anchor.behindDoc = behindDoc;
   const hasData = anchor.isAnchored || anchor.hRelativeFrom != null || anchor.vRelativeFrom != null || anchor.alignH != null || anchor.alignV != null || anchor.offsetH != null || anchor.offsetV != null || anchor.behindDoc != null;
   return hasData ? anchor : void 0;
@@ -43976,7 +44247,7 @@ function handleShapeTextboxNode(node, context) {
   }
 }
 const getAttrs = (node) => {
-  return isPlainObject$3(node.attrs) ? { ...node.attrs } : {};
+  return isPlainObject$2(node.attrs) ? { ...node.attrs } : {};
 };
 const parseFullWidth = (value) => {
   if (typeof value === "string") {
@@ -43995,7 +44266,7 @@ function contentBlockNodeToDrawingBlock(node, nextBlockId, positions) {
   if (rawAttrs.horizontalRule !== true) {
     return null;
   }
-  const size2 = isPlainObject$3(rawAttrs.size) ? rawAttrs.size : void 0;
+  const size2 = isPlainObject$2(rawAttrs.size) ? rawAttrs.size : void 0;
   const { width, isFullWidth } = parseFullWidth(size2?.width);
   const height = pickNumber(size2?.height);
   if (!height || height <= 0) {
@@ -44197,6 +44468,9 @@ const extractRunStyleId = (runProperties) => {
   return null;
 };
 const DEFAULT_IMAGE_DIMENSION_PX = 100;
+const HALF_POINTS_PER_POINT = 2;
+const SCREEN_DPI = 96;
+const POINT_DPI = 72;
 function isInlineImage(node) {
   const attrs = node.attrs ?? {};
   const wrap = attrs.wrap;
@@ -44224,8 +44498,8 @@ function imageNodeToRun(node, positions, activeSdt) {
   const size2 = attrs.size ?? {};
   const width = typeof size2.width === "number" && Number.isFinite(size2.width) && size2.width > 0 ? size2.width : DEFAULT_IMAGE_DIMENSION_PX;
   const height = typeof size2.height === "number" && Number.isFinite(size2.height) && size2.height > 0 ? size2.height : DEFAULT_IMAGE_DIMENSION_PX;
-  const wrap = isPlainObject$3(attrs.wrap) ? attrs.wrap : {};
-  const wrapAttrs = isPlainObject$3(wrap.attrs) ? wrap.attrs : {};
+  const wrap = isPlainObject$2(attrs.wrap) ? attrs.wrap : {};
+  const wrapAttrs = isPlainObject$2(wrap.attrs) ? wrap.attrs : {};
   const run = {
     kind: "image",
     src,
@@ -44435,15 +44709,6 @@ const applyBaseRunDefaults = (run, defaults, uiDisplayFallbackFont, fallbackSize
   if (defaults.letterSpacing != null && run.letterSpacing == null) {
     run.letterSpacing = defaults.letterSpacing;
   }
-  if (defaults.bold && run.bold === void 0) {
-    run.bold = true;
-  }
-  if (defaults.italic && run.italic === void 0) {
-    run.italic = true;
-  }
-  if (defaults.underline && !run.underline) {
-    run.underline = defaults.underline;
-  }
 };
 function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext) {
   const baseBlockId = nextBlockId("paragraph");
@@ -44452,28 +44717,48 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
   const paragraphHydration = converterContext ? hydrateParagraphStyleAttrs(para, converterContext) : null;
   let baseRunDefaults = {};
   try {
-    const spacingSource = para.attrs?.spacing !== void 0 ? para.attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : paragraphHydration?.spacing;
-    const indentSource = para.attrs?.indent ?? paragraphProps.indent ?? paragraphHydration?.indent;
-    const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
-    const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? para.attrs?.textIndent);
-    const styleNodeAttrs = paragraphHydration?.tabStops && !para.attrs?.tabStops && !para.attrs?.tabs ? { ...para.attrs ?? {}, tabStops: paragraphHydration.tabStops } : para.attrs ?? {};
-    const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
-    if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
-      styleNode.styleId = paragraphProps.styleId;
-    }
-    const resolved = resolveStyle(styleNode, styleContext);
-    baseRunDefaults = {
-      fontFamily: resolved.character.font?.family,
-      fontSizePx: ptToPx(resolved.character.font?.size),
-      color: resolved.character.color,
-      bold: resolved.character.font?.weight != null ? resolved.character.font.weight >= 600 : void 0,
-      italic: resolved.character.font?.italic,
-      underline: resolved.character.underline ? {
-        style: resolved.character.underline.style,
-        color: resolved.character.underline.color
-      } : void 0,
-      letterSpacing: ptToPx(resolved.character.letterSpacing)
-    };
+    const charHydration = converterContext ? hydrateCharacterStyleAttrs(para, converterContext, paragraphHydration?.resolved) : null;
+    if (charHydration) {
+      const fontSizePx = charHydration.fontSize / HALF_POINTS_PER_POINT * (SCREEN_DPI / POINT_DPI);
+      baseRunDefaults = {
+        fontFamily: charHydration.fontFamily,
+        fontSizePx,
+        color: charHydration.color ? `#${charHydration.color.replace("#", "")}` : void 0,
+        bold: charHydration.bold,
+        italic: charHydration.italic,
+        underline: charHydration.underline ? {
+          style: charHydration.underline.type,
+          color: charHydration.underline.color
+        } : void 0,
+        letterSpacing: charHydration.letterSpacing != null ? twipsToPx$1(charHydration.letterSpacing) : void 0
+      };
+    } else {
+      const spacingSource = para.attrs?.spacing !== void 0 ? para.attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : paragraphHydration?.spacing;
+      const normalizeIndentObject = (value) => {
+        if (!value || typeof value !== "object") return;
+        return normalizePxIndent(value) ?? convertIndentTwipsToPx$1(value);
+      };
+      const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
+      const normalizedIndent = normalizeIndentObject(para.attrs?.indent) ?? convertIndentTwipsToPx$1(paragraphProps.indent) ?? convertIndentTwipsToPx$1(paragraphHydration?.indent) ?? normalizeParagraphIndent(para.attrs?.textIndent);
+      const styleNodeAttrs = paragraphHydration?.tabStops && !para.attrs?.tabStops && !para.attrs?.tabs ? { ...para.attrs ?? {}, tabStops: paragraphHydration.tabStops } : para.attrs ?? {};
+      const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
+      if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
+        styleNode.styleId = paragraphProps.styleId;
+      }
+      const resolved = resolveStyle(styleNode, styleContext);
+      baseRunDefaults = {
+        fontFamily: resolved.character.font?.family,
+        fontSizePx: ptToPx(resolved.character.font?.size),
+        color: resolved.character.color,
+        bold: resolved.character.font?.weight != null ? resolved.character.font.weight >= 600 : void 0,
+        italic: resolved.character.font?.italic,
+        underline: resolved.character.underline ? {
+          style: resolved.character.underline.style,
+          color: resolved.character.underline.color
+        } : void 0,
+        letterSpacing: ptToPx(resolved.character.letterSpacing)
+      };
+    }
   } catch {
     baseRunDefaults = {};
   }
@@ -46175,6 +46460,9 @@ const createHeaderFooterEditor = ({
 };
 const onHeaderFooterDataUpdate = async ({ editor, transaction }, mainEditor, sectionId, type) => {
   if (!type || !sectionId) return;
+  if (isApplyingRemoteHeaderFooterChanges()) {
+    return;
+  }
   const updatedData = editor.getUpdatedJson();
   const editorsList = mainEditor.converter[`${type}Editors`];
   if (Array.isArray(editorsList)) {
@@ -46198,6 +46486,7 @@ const onHeaderFooterDataUpdate = async ({ editor, transaction }, mainEditor, sec
   if (editor.docChanged && mainEditor.converter) {
     mainEditor.converter.headerFooterModified = true;
   }
+  pushHeaderFooterToYjs(mainEditor, type, sectionId, updatedData);
   await updateYdocDocxData(mainEditor);
 };
 const setEditorToolbar = ({ editor }, mainEditor) => {
@@ -48024,7 +48313,8 @@ async function measureParagraphBlock(block, maxWidth) {
       const originX = currentLine.width;
       const { target, nextIndex, stop } = getNextTabStopPx(currentLine.width, tabStops, tabStopCursor);
       tabStopCursor = nextIndex;
-      const tabAdvance = Math.max(0, target - currentLine.width);
+      const clampedTarget = Math.min(target, currentLine.maxWidth);
+      const tabAdvance = Math.max(0, clampedTarget - currentLine.width);
       currentLine.width = roundValue(currentLine.width + tabAdvance);
       run.width = tabAdvance;
       currentLine.maxFontSize = Math.max(currentLine.maxFontSize, 12);
@@ -48032,14 +48322,14 @@ async function measureParagraphBlock(block, maxWidth) {
       currentLine.toChar = 1;
       if (stop) {
         validateTabStopVal(stop);
-        pendingTabAlignment = { target, val: stop.val };
+        pendingTabAlignment = { target: clampedTarget, val: stop.val };
       } else {
         pendingTabAlignment = null;
       }
       if (stop && stop.leader && stop.leader !== "none") {
         const leaderStyle = stop.leader;
-        const from3 = Math.min(originX, target);
-        const to = Math.max(originX, target);
+        const from3 = Math.min(originX, clampedTarget);
+        const to = Math.max(originX, clampedTarget);
         if (!currentLine.leaders) currentLine.leaders = [];
         currentLine.leaders.push({ from: from3, to, style: leaderStyle });
       }
@@ -48634,7 +48924,8 @@ async function measureParagraphBlock(block, maxWidth) {
         const originX = currentLine.width;
         const { target, nextIndex, stop } = getNextTabStopPx(currentLine.width, tabStops, tabStopCursor);
         tabStopCursor = nextIndex;
-        const tabAdvance = Math.max(0, target - currentLine.width);
+        const clampedTarget = Math.min(target, currentLine.maxWidth);
+        const tabAdvance = Math.max(0, clampedTarget - currentLine.width);
         currentLine.width = roundValue(currentLine.width + tabAdvance);
         currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run);
         currentLine.maxFontSize = Math.max(currentLine.maxFontSize, run.fontSize);
@@ -48643,14 +48934,14 @@ async function measureParagraphBlock(block, maxWidth) {
         charPosInRun += 1;
         if (stop) {
           validateTabStopVal(stop);
-          pendingTabAlignment = { target, val: stop.val };
+          pendingTabAlignment = { target: clampedTarget, val: stop.val };
         } else {
           pendingTabAlignment = null;
         }
         if (stop && stop.leader && stop.leader !== "none" && stop.leader !== "middleDot") {
           const leaderStyle = stop.leader;
-          const from3 = Math.min(originX, target);
-          const to = Math.max(originX, target);
+          const from3 = Math.min(originX, clampedTarget);
+          const to = Math.max(originX, clampedTarget);
           if (!currentLine.leaders) currentLine.leaders = [];
           currentLine.leaders.push({ from: from3, to, style: leaderStyle });
         }
@@ -51047,6 +51338,17 @@ class PresentationEditor extends EventEmitter {
       event: "collaborationReady",
       handler: handleCollaborationReady
     });
+    const handleRemoteHeaderFooterChanged = (payload) => {
+      this.#headerFooterAdapter?.invalidate(payload.sectionId);
+      this.#headerFooterManager?.refresh();
+      this.#pendingDocChange = true;
+      this.#scheduleRerender();
+    };
+    this.#editor.on("remoteHeaderFooterChanged", handleRemoteHeaderFooterChanged);
+    this.#editorListeners.push({
+      event: "remoteHeaderFooterChanged",
+      handler: handleRemoteHeaderFooterChanged
+    });
   }
   /**
    * Setup awareness event subscriptions for remote cursor tracking.
@@ -57206,16 +57508,112 @@ const mapRangesThroughTransactions = (ranges, transactions, docSize) => {
   });
   return mergeRanges$2(mapped, docSize);
 };
-const buildWrapTransaction = (state, ranges, runType) => {
+const getParagraphAtPos = (doc2, pos) => {
+  try {
+    const $pos = doc2.resolve(pos);
+    for (let depth = $pos.depth; depth >= 0; depth--) {
+      const node = $pos.node(depth);
+      if (node.type.name === "paragraph") {
+        return node;
+      }
+    }
+  } catch (_e) {
+  }
+  return null;
+};
+const resolveRunPropertiesFromParagraphStyle = (paragraphNode, editor) => {
+  if (!paragraphNode || !editor?.converter) return {};
+  const styleId = paragraphNode.attrs?.paragraphProperties?.styleId;
+  if (!styleId) return {};
+  try {
+    const params2 = { docx: editor.converter.convertedXml, numbering: editor.converter.numbering };
+    const resolvedPpr = { styleId };
+    const runProps = superEditor_converter.resolveRunProperties(params2, {}, resolvedPpr, false, false);
+    const runProperties = {};
+    if (runProps.fontFamily) {
+      const fontValue = runProps.fontFamily.ascii || runProps.fontFamily;
+      if (fontValue) {
+        runProperties.fontFamily = typeof fontValue === "string" ? fontValue : fontValue.ascii;
+      }
+    }
+    if (runProps.fontSize) {
+      runProperties.fontSize = `${runProps.fontSize / 2}pt`;
+    }
+    if (runProps.bold) runProperties.bold = true;
+    if (runProps.italic) runProperties.italic = true;
+    if (runProps.underline) runProperties.underline = runProps.underline;
+    if (runProps.strike) runProperties.strike = true;
+    return runProperties;
+  } catch (_e) {
+    return {};
+  }
+};
+const createMarksFromDefs = (schema, markDefs = []) => markDefs.map((def) => {
+  const markType = schema.marks[def.type];
+  return markType ? markType.create(def.attrs) : null;
+}).filter(Boolean);
+const createMarkDefsFromStyleRunProps = (styleRunProps) => {
+  const markDefs = [];
+  const textStyleAttrs = {};
+  if (styleRunProps.fontSize) {
+    textStyleAttrs.fontSize = styleRunProps.fontSize;
+  }
+  if (styleRunProps.fontFamily) {
+    textStyleAttrs.fontFamily = styleRunProps.fontFamily;
+  }
+  if (Object.keys(textStyleAttrs).length > 0) {
+    markDefs.push({ type: "textStyle", attrs: textStyleAttrs });
+  }
+  if (styleRunProps.bold) {
+    markDefs.push({ type: "bold", attrs: { value: true } });
+  }
+  if (styleRunProps.italic) {
+    markDefs.push({ type: "italic", attrs: { value: true } });
+  }
+  if (styleRunProps.strike) {
+    markDefs.push({ type: "strike", attrs: { value: true } });
+  }
+  if (styleRunProps.underline) {
+    const underlineType = styleRunProps.underline["w:val"];
+    if (underlineType) {
+      let underlineColor = styleRunProps.underline["w:color"];
+      if (underlineColor && underlineColor.toLowerCase() !== "auto" && !underlineColor.startsWith("#")) {
+        underlineColor = `#${underlineColor}`;
+      }
+      markDefs.push({
+        type: "underline",
+        attrs: { underlineType, underlineColor }
+      });
+    }
+  }
+  return markDefs;
+};
+const buildWrapTransaction = (state, ranges, runType, editor, markDefsFromMeta = []) => {
   if (!ranges.length) return null;
   const replacements = [];
+  const metaStyleMarks = createMarksFromDefs(state.schema, markDefsFromMeta);
   ranges.forEach(({ from: from3, to }) => {
     state.doc.nodesBetween(from3, to, (node, pos, parent, index2) => {
       if (!node.isText || !parent || parent.type === runType) return;
       const match = parent.contentMatchAt ? parent.contentMatchAt(index2) : null;
       if (match && !match.matchType(runType)) return;
       if (!match && !parent.type.contentMatch.matchType(runType)) return;
-      const runProperties = superEditor_converter.decodeRPrFromMarks(node.marks);
+      let runProperties = superEditor_converter.decodeRPrFromMarks(node.marks);
+      if ((!node.marks || node.marks.length === 0) && editor?.converter) {
+        const paragraphNode = getParagraphAtPos(state.doc, pos);
+        const styleRunProps = resolveRunPropertiesFromParagraphStyle(paragraphNode, editor);
+        if (Object.keys(styleRunProps).length > 0) {
+          runProperties = styleRunProps;
+          const markDefs = metaStyleMarks.length ? markDefsFromMeta : createMarkDefsFromStyleRunProps(styleRunProps);
+          const styleMarks = metaStyleMarks.length ? metaStyleMarks : createMarksFromDefs(state.schema, markDefs);
+          if (styleMarks.length && typeof state.schema.text === "function") {
+            const textNode = state.schema.text(node.text || "", styleMarks);
+            if (textNode) {
+              node = textNode;
+            }
+          }
+        }
+      }
       const runNode = runType.create({ runProperties }, node);
       replacements.push({ from: pos, to: pos + node.nodeSize, runNode });
     });
@@ -57225,9 +57623,10 @@ const buildWrapTransaction = (state, ranges, runType) => {
   replacements.sort((a, b) => b.from - a.from).forEach(({ from: from3, to, runNode }) => tr.replaceWith(from3, to, runNode));
   return tr.docChanged ? tr : null;
 };
-const wrapTextInRunsPlugin = () => {
+const wrapTextInRunsPlugin = (editor) => {
   let view = null;
   let pendingRanges = [];
+  let lastStyleMarksMeta = [];
   const flush = () => {
     if (!view) return;
     const runType = view.state.schema.nodes.run;
@@ -57235,7 +57634,7 @@ const wrapTextInRunsPlugin = () => {
       pendingRanges = [];
       return;
     }
-    const tr = buildWrapTransaction(view.state, pendingRanges, runType);
+    const tr = buildWrapTransaction(view.state, pendingRanges, runType, editor, lastStyleMarksMeta);
     pendingRanges = [];
     if (tr) {
       view.dispatch(tr);
@@ -57254,6 +57653,7 @@ const wrapTextInRunsPlugin = () => {
           editorView.dom.removeEventListener("compositionend", onCompositionEnd);
           view = null;
           pendingRanges = [];
+          lastStyleMarksMeta = [];
         }
       };
     },
@@ -57267,7 +57667,11 @@ const wrapTextInRunsPlugin = () => {
       if (view?.composing) {
         return null;
       }
-      const tr = buildWrapTransaction(newState, pendingRanges, runType);
+      const latestStyleMarksMeta = [...transactions].reverse().find((tr2) => tr2.getMeta && tr2.getMeta("sdStyleMarks"))?.getMeta("sdStyleMarks") || lastStyleMarksMeta;
+      if (latestStyleMarksMeta && latestStyleMarksMeta.length) {
+        lastStyleMarksMeta = latestStyleMarksMeta;
+      }
+      const tr = buildWrapTransaction(newState, pendingRanges, runType, editor, latestStyleMarksMeta);
       pendingRanges = [];
       return tr;
     }
@@ -57530,7 +57934,7 @@ const Run = OxmlNode.create({
   },
   addPmPlugins() {
     return [
-      wrapTextInRunsPlugin(),
+      wrapTextInRunsPlugin(this.editor),
       splitRunsAfterMarkPlugin,
       calculateInlineRunPropertiesPlugin(this.editor),
       cleanupEmptyRunsPlugin