superdoc 0.31.0-next.4 → 0.31.0-next.6

package/dist/chunks/{super-editor.es-DUqAKtdo.es.js → super-editor.es-BWeMHRHm.es.js}

@@ -15409,19 +15409,6 @@ const hasSomeParentWithClass = (element, classname) => {
   if (element.className?.split(" ")?.indexOf(classname) >= 0) return true;
   return element.parentNode && hasSomeParentWithClass(element.parentNode, classname);
 };
-function generateDocxRandomId(length2 = 8) {
-  const max2 = 2147483647;
-  const value = Math.floor(Math.random() * (max2 + 1));
-  return value.toString(16).padStart(length2, "0").slice(0, length2);
-}
-function generateRandomSigned32BitIntStrId() {
-  const val = Math.floor(Math.random() * 2147483647);
-  return val.toString();
-}
-function generateRandom32BitHex() {
-  const val = Math.floor(Math.random() * 2147483647);
-  return val.toString(16).toUpperCase().padStart(8, "0");
-}
 const DEFAULT_DOCX_DEFS = {
   "xmlns:wpc": "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
   "xmlns:cx": "http://schemas.microsoft.com/office/drawing/2014/chartex",
@@ -16627,15 +16614,6 @@ const COMMENTS_XML_DEFINITIONS = {
   DOCUMENT_RELS_XML_DEF,
   CONTENT_TYPES
 };
-const carbonCopy = (obj) => {
-  if (!obj) return void 0;
-  try {
-    return JSON.parse(JSON.stringify(obj));
-  } catch (e) {
-    console.error("Error in carbonCopy", obj, e);
-    return void 0;
-  }
-};
 function translateChildNodes(params2) {
   const { content: nodes } = params2.node;
   if (!nodes) return [];
@@ -18243,6 +18221,15 @@ const config$n = {
   attributes: validXmlAttributes$h
 };
 const translator$21 = NodeTranslator.from(config$n);
+const carbonCopy = (obj) => {
+  if (!obj) return void 0;
+  try {
+    return JSON.parse(JSON.stringify(obj));
+  } catch (e) {
+    console.error("Error in carbonCopy", obj, e);
+    return void 0;
+  }
+};
 const mergeTextNodes = (nodes) => {
   if (!nodes || !Array.isArray(nodes)) {
     return nodes;
@@ -20076,6 +20063,56 @@ const handleParagraphNode$1 = (params2) => {
   }
   return schemaNode;
 };
+function generateParagraphProperties(params2) {
+  const { node } = params2;
+  const { attrs = {} } = node;
+  const paragraphProperties = carbonCopy(attrs.paragraphProperties || {});
+  if (attrs.styleId !== paragraphProperties.styleId) {
+    paragraphProperties.styleId = attrs.styleId;
+  }
+  ["borders", "styleId", "indent", "textAlign", "keepLines", "keepNext", "spacing", "tabStops"].forEach((key2) => {
+    let propKey = key2 === "textAlign" ? "justification" : key2;
+    if (JSON.stringify(paragraphProperties[propKey]) !== JSON.stringify(attrs[key2])) {
+      paragraphProperties[propKey] = attrs[key2];
+    }
+  });
+  const framePr = attrs.dropcap;
+  if (framePr) {
+    framePr.dropCap = framePr.type;
+    delete framePr.type;
+  }
+  if (JSON.stringify(paragraphProperties.framePr) !== JSON.stringify(framePr)) {
+    paragraphProperties.framePr = framePr;
+  }
+  const marksProps = decodeRPrFromMarks(attrs.marksAttrs || []);
+  const finalRunProps = combineRunProperties([paragraphProperties.runProperties || {}, marksProps]);
+  paragraphProperties.runProperties = finalRunProps;
+  const pPr = translator$12.decode({ node: { ...node, attrs: { paragraphProperties } } });
+  const sectPr = node.attrs?.paragraphProperties?.sectPr;
+  if (sectPr) {
+    pPr.elements.push(sectPr);
+  }
+  return pPr;
+}
+function translateParagraphNode(params2) {
+  const elements = translateChildNodes(params2);
+  const htmlAnnotationChild = elements.find((element) => element.name === "htmlAnnotation");
+  if (htmlAnnotationChild) {
+    return htmlAnnotationChild.elements;
+  }
+  const pPr = generateParagraphProperties(params2);
+  if (pPr) elements.unshift(pPr);
+  let attributes = {};
+  if (params2.node.attrs?.rsidRDefault) {
+    attributes["w:rsidRDefault"] = params2.node.attrs.rsidRDefault;
+  }
+  const result = {
+    name: "w:p",
+    elements,
+    attributes
+  };
+  return result;
+}
 const encode$A = (attributes) => {
   return attributes["w:rsidDel"];
 };
@@ -20355,6 +20392,19 @@ const ensureTrackedWrapper = (runs, trackingMarksByType = /* @__PURE__ */ new Ma
   }
   return runs;
 };
+function generateDocxRandomId(length2 = 8) {
+  const max2 = 2147483647;
+  const value = Math.floor(Math.random() * (max2 + 1));
+  return value.toString(16).padStart(length2, "0").slice(0, length2);
+}
+function generateRandomSigned32BitIntStrId() {
+  const val = Math.floor(Math.random() * 2147483647);
+  return val.toString();
+}
+function generateRandom32BitHex() {
+  const val = Math.floor(Math.random() * 2147483647);
+  return val.toString(16).toUpperCase().padStart(8, "0");
+}
 const XML_NODE_NAME$j = "w:hyperlink";
 const SD_NODE_NAME$g = "link";
 const _createAttributeHandler = (xmlName, sdName) => ({
@@ -20451,13 +20501,13 @@ function _addNewLinkRelationship(params2, link) {
     type: "element",
     name: "Relationship",
     attributes: {
-      Id: id,
+      Id: `rId${id}`,
       Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
       Target: link,
       TargetMode: "External"
     }
   });
-  return id;
+  return `rId${id}`;
 }
 const config$i = {
   xmlName: XML_NODE_NAME$j,
@@ -30471,6 +30521,59 @@ const config$c = {
   attributes: validXmlAttributes$6
 };
 const translator$s = NodeTranslator.from(config$c);
+function getTextNodeForExport(text, marks, params2) {
+  const hasLeadingOrTrailingSpace = /^\s|\s$/.test(text);
+  const space = hasLeadingOrTrailingSpace ? "preserve" : null;
+  const nodeAttrs = space ? { "xml:space": space } : null;
+  const textNodes = [];
+  const textRunProperties = decodeRPrFromMarks(marks || []);
+  const parentRunProperties = params2.extraParams?.runProperties || {};
+  const combinedRunProperties = combineRunProperties([parentRunProperties, textRunProperties]);
+  const rPrNode = translator$1N.decode({ node: { attrs: { runProperties: combinedRunProperties } } });
+  textNodes.push({
+    name: "w:t",
+    elements: [{ text, type: "text" }],
+    attributes: nodeAttrs
+  });
+  if (params2) {
+    const { editor } = params2;
+    const customMarks = editor.extensionService.extensions.filter((e) => e.isExternal === true);
+    marks.forEach((mark) => {
+      const isCustomMark = customMarks.some((customMark) => {
+        const customMarkName = customMark.name;
+        return mark.type === customMarkName;
+      });
+      if (!isCustomMark) return;
+      let attrsString = "";
+      Object.entries(mark.attrs).forEach(([key2, value]) => {
+        if (value) {
+          attrsString += `${key2}=${value};`;
+        }
+      });
+      if (isCustomMark) {
+        textNodes.unshift({
+          type: "element",
+          name: "w:bookmarkStart",
+          attributes: {
+            "w:id": "5000",
+            "w:name": mark.type + ";" + attrsString
+          }
+        });
+        textNodes.push({
+          type: "element",
+          name: "w:bookmarkEnd",
+          attributes: {
+            "w:id": "5000"
+          }
+        });
+      }
+    });
+  }
+  return {
+    name: "w:r",
+    elements: rPrNode ? [rPrNode, ...textNodes] : textNodes
+  };
+}
 var he$2 = { exports: {} };
 /*! https://mths.be/he v1.2.0 by @mathias | MIT license */
 var he$1 = he$2.exports;
@@ -30877,18 +30980,31 @@ function prepareUrlAnnotation(params2) {
     node: { attrs = {}, marks = [] }
   } = params2;
   if (!attrs.linkUrl) return prepareTextAnnotation(params2);
-  const newId = addNewLinkRelationship(params2, attrs.linkUrl);
-  const linkTextNode = getTextNodeForExport(attrs.linkUrl, marks, params2);
-  const contentNode = processLinkContentNode(linkTextNode);
-  return {
-    name: "w:hyperlink",
-    type: "element",
-    attributes: {
-      "r:id": newId,
-      "w:history": 1
-    },
-    elements: [contentNode]
+  const linkTextNode = {
+    type: "text",
+    text: attrs.linkUrl,
+    marks: [
+      ...marks,
+      {
+        type: "link",
+        attrs: {
+          href: attrs.linkUrl,
+          history: true,
+          text: attrs.linkUrl
+        }
+      },
+      {
+        type: "textStyle",
+        attrs: {
+          color: "#467886"
+        }
+      }
+    ]
   };
+  return translator$10.decode({
+    ...params2,
+    node: linkTextNode
+  });
 }
 function translateFieldAttrsToMarks(attrs = {}) {
   const { fontFamily: fontFamily2, fontSize: fontSize2, bold, underline, italic, textColor, textHighlight } = attrs;
@@ -31081,6 +31197,46 @@ function translateDocumentPartObj(params2) {
   };
   return result;
 }
+const RUN_LEVEL_WRAPPERS = /* @__PURE__ */ new Set(["w:hyperlink", "w:ins", "w:del"]);
+function convertSdtContentToRuns(elements) {
+  const normalized = Array.isArray(elements) ? elements : [elements];
+  const runs = [];
+  normalized.forEach((element) => {
+    if (!element) return;
+    if (element.name === "w:sdtPr") {
+      return;
+    }
+    if (element.name === "w:r") {
+      runs.push(element);
+      return;
+    }
+    if (element.name === "w:sdt") {
+      const sdtContent = (element.elements || []).find((child) => child?.name === "w:sdtContent");
+      if (sdtContent?.elements) {
+        runs.push(...convertSdtContentToRuns(sdtContent.elements));
+      }
+      return;
+    }
+    if (RUN_LEVEL_WRAPPERS.has(element.name)) {
+      const wrapperElements = convertSdtContentToRuns(element.elements || []);
+      if (wrapperElements.length) {
+        runs.push({
+          ...element,
+          elements: wrapperElements
+        });
+      }
+      return;
+    }
+    if (element.name) {
+      runs.push({
+        name: "w:r",
+        type: "element",
+        elements: element.elements || [element]
+      });
+    }
+  });
+  return runs.filter((run2) => Array.isArray(run2.elements) && run2.elements.length > 0);
+}
 function translateStructuredContent(params2) {
   const { node, isFinalDoc } = params2;
   const childContent = translateChildNodes({ ...params2, node });
@@ -34328,7 +34484,6 @@ const config = {
   attributes: validXmlAttributes
 };
 const translator = NodeTranslator.from(config);
-const RUN_LEVEL_WRAPPERS = /* @__PURE__ */ new Set(["w:hyperlink", "w:ins", "w:del"]);
 const DEFAULT_SECTION_PROPS_TWIPS = Object.freeze({
   pageSize: Object.freeze({ width: "12240", height: "15840" }),
   pageMargins: Object.freeze({
@@ -34386,45 +34541,6 @@ const ensureSectionLayoutDefaults = (sectPr, converter) => {
   });
   return sectPr;
 };
-function convertSdtContentToRuns(elements) {
-  const normalized = Array.isArray(elements) ? elements : [elements];
-  const runs = [];
-  normalized.forEach((element) => {
-    if (!element) return;
-    if (element.name === "w:sdtPr") {
-      return;
-    }
-    if (element.name === "w:r") {
-      runs.push(element);
-      return;
-    }
-    if (element.name === "w:sdt") {
-      const sdtContent = (element.elements || []).find((child) => child?.name === "w:sdtContent");
-      if (sdtContent?.elements) {
-        runs.push(...convertSdtContentToRuns(sdtContent.elements));
-      }
-      return;
-    }
-    if (RUN_LEVEL_WRAPPERS.has(element.name)) {
-      const wrapperElements = convertSdtContentToRuns(element.elements || []);
-      if (wrapperElements.length) {
-        runs.push({
-          ...element,
-          elements: wrapperElements
-        });
-      }
-      return;
-    }
-    if (element.name) {
-      runs.push({
-        name: "w:r",
-        type: "element",
-        elements: element.elements || [element]
-      });
-    }
-  });
-  return runs.filter((run2) => Array.isArray(run2.elements) && run2.elements.length > 0);
-}
 function exportSchemaToJson(params2) {
   const { type: type2 } = params2.node || {};
   const router = {
@@ -34531,57 +34647,7 @@ function translateHeadingNode(params2) {
       // Maps to Heading1, Heading2, etc. in Word
     }
   };
-  return translateParagraphNode({ ...params2, node: paragraphNode });
-}
-function translateParagraphNode(params2) {
-  const elements = translateChildNodes(params2);
-  const htmlAnnotationChild = elements.find((element) => element.name === "htmlAnnotation");
-  if (htmlAnnotationChild) {
-    return htmlAnnotationChild.elements;
-  }
-  const pPr = generateParagraphProperties(params2);
-  if (pPr) elements.unshift(pPr);
-  let attributes = {};
-  if (params2.node.attrs?.rsidRDefault) {
-    attributes["w:rsidRDefault"] = params2.node.attrs.rsidRDefault;
-  }
-  const result = {
-    name: "w:p",
-    elements,
-    attributes
-  };
-  return result;
-}
-function generateParagraphProperties(params2) {
-  const { node } = params2;
-  const { attrs = {} } = node;
-  const paragraphProperties = carbonCopy(attrs.paragraphProperties || {});
-  if (attrs.styleId !== paragraphProperties.styleId) {
-    paragraphProperties.styleId = attrs.styleId;
-  }
-  ["borders", "styleId", "indent", "textAlign", "keepLines", "keepNext", "spacing", "tabStops"].forEach((key2) => {
-    let propKey = key2 === "textAlign" ? "justification" : key2;
-    if (JSON.stringify(paragraphProperties[propKey]) !== JSON.stringify(attrs[key2])) {
-      paragraphProperties[key2] = attrs[key2];
-    }
-  });
-  const framePr = attrs.dropcap;
-  if (framePr) {
-    framePr.dropCap = framePr.type;
-    delete framePr.type;
-  }
-  if (JSON.stringify(paragraphProperties.framePr) !== JSON.stringify(framePr)) {
-    paragraphProperties.framePr = framePr;
-  }
-  const marksProps = decodeRPrFromMarks(attrs.marksAttrs || []);
-  const finalRunProps = combineRunProperties([paragraphProperties.runProperties || {}, marksProps]);
-  paragraphProperties.runProperties = finalRunProps;
-  const pPr = translator$12.decode({ node: { ...node, attrs: { paragraphProperties } } });
-  const sectPr = node.attrs?.paragraphProperties?.sectPr;
-  if (sectPr) {
-    pPr.elements.push(sectPr);
-  }
-  return pPr;
+  return translator$11.decode({ ...params2, node: paragraphNode });
 }
 function translateDocumentNode(params2) {
   const bodyNode = {
@@ -34596,59 +34662,6 @@ function translateDocumentNode(params2) {
   };
   return [node, params2];
 }
-function getTextNodeForExport(text, marks, params2) {
-  const hasLeadingOrTrailingSpace = /^\s|\s$/.test(text);
-  const space = hasLeadingOrTrailingSpace ? "preserve" : null;
-  const nodeAttrs = space ? { "xml:space": space } : null;
-  const textNodes = [];
-  const textRunProperties = decodeRPrFromMarks(marks || []);
-  const parentRunProperties = params2.extraParams?.runProperties || {};
-  const combinedRunProperties = combineRunProperties([parentRunProperties, textRunProperties]);
-  const rPrNode = translator$1N.decode({ node: { attrs: { runProperties: combinedRunProperties } } });
-  textNodes.push({
-    name: "w:t",
-    elements: [{ text, type: "text" }],
-    attributes: nodeAttrs
-  });
-  if (params2) {
-    const { editor } = params2;
-    const customMarks = editor.extensionService.extensions.filter((e) => e.isExternal === true);
-    marks.forEach((mark) => {
-      const isCustomMark = customMarks.some((customMark) => {
-        const customMarkName = customMark.name;
-        return mark.type === customMarkName;
-      });
-      if (!isCustomMark) return;
-      let attrsString = "";
-      Object.entries(mark.attrs).forEach(([key2, value]) => {
-        if (value) {
-          attrsString += `${key2}=${value};`;
-        }
-      });
-      if (isCustomMark) {
-        textNodes.unshift({
-          type: "element",
-          name: "w:bookmarkStart",
-          attributes: {
-            "w:id": "5000",
-            "w:name": mark.type + ";" + attrsString
-          }
-        });
-        textNodes.push({
-          type: "element",
-          name: "w:bookmarkEnd",
-          attributes: {
-            "w:id": "5000"
-          }
-        });
-      }
-    });
-  }
-  return {
-    name: "w:r",
-    elements: rPrNode ? [rPrNode, ...textNodes] : textNodes
-  };
-}
 function wrapTextInRun(nodeOrNodes, marks) {
   let elements = [];
   if (Array.isArray(nodeOrNodes)) elements = nodeOrNodes;
@@ -34677,60 +34690,6 @@ function processOutputMarks(marks = []) {
     }
   });
 }
-function processLinkContentNode(node) {
-  if (!node) return node;
-  const contentNode = carbonCopy(node);
-  if (!contentNode) return contentNode;
-  const hyperlinkStyle = {
-    name: "w:rStyle",
-    attributes: { "w:val": "Hyperlink" }
-  };
-  const color = {
-    name: "w:color",
-    attributes: { "w:val": "467886" }
-  };
-  const underline = {
-    name: "w:u",
-    attributes: {
-      "w:val": "none"
-    }
-  };
-  if (contentNode.name === "w:r") {
-    const runProps = contentNode.elements.find((el) => el.name === "w:rPr");
-    if (runProps) {
-      const foundColor = runProps.elements.find((el) => el.name === "w:color");
-      const foundHyperlinkStyle = runProps.elements.find((el) => el.name === "w:rStyle");
-      const underlineMark = runProps.elements.find((el) => el.name === "w:u");
-      if (!foundColor) runProps.elements.unshift(color);
-      if (!foundHyperlinkStyle) runProps.elements.unshift(hyperlinkStyle);
-      if (!underlineMark) runProps.elements.unshift(underline);
-    } else {
-      const runProps2 = {
-        name: "w:rPr",
-        elements: [hyperlinkStyle, color]
-      };
-      contentNode.elements.unshift(runProps2);
-    }
-  }
-  return contentNode;
-}
-function addNewLinkRelationship(params2, link) {
-  const newId = "rId" + generateDocxRandomId();
-  if (!params2.relationships || !Array.isArray(params2.relationships)) {
-    params2.relationships = [];
-  }
-  params2.relationships.push({
-    type: "element",
-    name: "Relationship",
-    attributes: {
-      Id: newId,
-      Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
-      Target: link,
-      TargetMode: "External"
-    }
-  });
-  return newId;
-}
 function translateMark(mark) {
   const xmlMark = SuperConverter.markTypes.find((m2) => m2.type === mark.type);
   if (!xmlMark) {
@@ -34911,7 +34870,7 @@ const prepareCommentParaIds = (comment) => {
   return newComment;
 };
 const getCommentDefinition = (comment, commentId, allComments, editor) => {
-  const translatedText = translateParagraphNode({ editor, node: comment.commentJSON });
+  const translatedText = translator$11.decode({ editor, node: comment.commentJSON });
   const attributes = {
     "w:id": String(commentId),
     "w:author": comment.creatorName || comment.importedAuthor?.name,
@@ -35326,7 +35285,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.31.0-next.4") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.31.0-next.6") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -52586,7 +52545,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      import("./index-BmNdb0G--hU1qknba.es.js"),
+      import("./index-DAES86tg-BDL6WVta.es.js"),
       import("./index-DRCvimau-Cw339678.es.js"),
       import("./index-C_x_N6Uh-DJn8hIEt.es.js"),
       import("./index-D_sWOSiG-DE96TaT5.es.js"),
@@ -52787,7 +52746,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.31.0-next.4");
+    console.debug("[checkVersionMigrations] Current editor version", "0.31.0-next.6");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -56606,7 +56565,7 @@ const applyLinkedStyleToTransaction = (tr, editor, style2) => {
   let selection = tr.selection;
   const state2 = editor.state;
   const focusState = CustomSelectionPluginKey.getState(state2);
-  if (selection.empty && focusState?.preservedSelection) {
+  if (selection.empty && focusState?.preservedSelection && !focusState?.preservedSelection.empty) {
     selection = focusState.preservedSelection;
     tr.setSelection(selection);
   } else if (selection.empty && editor.options.lastSelection) {
@@ -56673,6 +56632,31 @@ const applyLinkedStyleToTransaction = (tr, editor, style2) => {
   });
   return true;
 };
+const stepInsertsTextIntoStyledParagraph = (tr, oldEditorState, step, stepIndex) => {
+  if (!step.slice || step.slice.size === 0 || typeof step.from !== "number") {
+    return false;
+  }
+  let insertsText = false;
+  step.slice.content.descendants((node) => {
+    if (node.type?.name === "text" && node.text?.length) {
+      insertsText = true;
+      return false;
+    }
+    return true;
+  });
+  if (!insertsText) return false;
+  const docBeforeStep = tr.docs?.[stepIndex] || oldEditorState.doc;
+  if (!docBeforeStep) return false;
+  const resolvedPos = Math.min(step.from, docBeforeStep.content.size);
+  const $pos = docBeforeStep.resolve(resolvedPos);
+  for (let depth = $pos.depth; depth >= 0; depth--) {
+    const node = $pos.node(depth);
+    if (node?.type?.name === "paragraph") {
+      return Boolean(node.attrs?.styleId);
+    }
+  }
+  return false;
+};
 const LinkedStylesPluginKey = new PluginKey("linkedStyles");
 const createLinkedStylesPlugin = (editor) => {
   return new Plugin({
@@ -56706,7 +56690,7 @@ const createLinkedStylesPlugin = (editor) => {
         if (tr.docChanged) {
           let mightAffectStyles = false;
           const styleRelatedMarks = /* @__PURE__ */ new Set(["textStyle", "bold", "italic", "underline", "strike"]);
-          tr.steps.forEach((step) => {
+          tr.steps.forEach((step, index2) => {
             if (step.slice) {
               step.slice.content.descendants((node) => {
                 if (node.attrs?.styleId) {
@@ -56727,6 +56711,9 @@ const createLinkedStylesPlugin = (editor) => {
                 mightAffectStyles = true;
               }
             }
+            if (!mightAffectStyles && stepInsertsTextIntoStyledParagraph(tr, oldEditorState, step, index2)) {
+              mightAffectStyles = true;
+            }
           });
           if (mightAffectStyles) {
             const styles = LinkedStylesPluginKey.getState(editor.state).styles;
@@ -58077,6 +58064,8 @@ const Paragraph = OxmlNode.create({
         }
       },
       styleId: {
+        default: null,
+        keepOnSplit: false,
         renderDOM: (attrs) => {
           if (!attrs.styleId) return {};
           return { styleid: attrs.styleId };