superdoc 0.30.0-next.5 → 0.30.0-next.7

package/dist/superdoc.umd.js

@@ -15397,6 +15397,9 @@
     let [value, unit] = parseSizeUnit(lineHeight2);
     if (Number.isNaN(value) || value === 0) return {};
     if (lineRule === "atLeast" && value < 1) return {};
+    if (!unit && value < 1) {
+      value = 1;
+    }
     unit = unit ? unit : defaultUnit;
     return isObject2 ? { ["line-height"]: `${value}${unit}` } : `line-height: ${value}${unit}`;
   };
@@ -27480,7 +27483,12 @@
     }
     const findElement = (name) => listDefinition.elements?.find((item) => item.name === name);
     const startElement = findElement("w:start");
-    const numFmtElement = findElement("w:numFmt");
+    let numFmtElement = findElement("w:numFmt");
+    if (!numFmtElement) {
+      const mcAlternate = listDefinition.elements?.find((item) => item.name === "mc:AlternateContent");
+      const choice = mcAlternate?.elements?.find((el) => el.name === "mc:Choice");
+      numFmtElement = choice?.elements?.find((item) => item.name === "w:numFmt");
+    }
     const lvlTextElement = findElement("w:lvlText");
     const suffixElement = findElement("w:suff");
     const lvlJcElement = findElement("w:lvlJc");
@@ -33950,13 +33958,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         importListDefs[numericKey] = value;
       }
     });
-    const listDefsEntries = Object.entries(importListDefs);
-    const foundByDurableId = listDefsEntries.filter(([, def2]) => def2.attributes?.["w16cid:durableId"] === "485517411");
-    if (foundByDurableId.length > 1) {
-      importListDefs = Object.fromEntries(
-        listDefsEntries.filter(([, def2]) => def2.attributes?.["w16cid:durableId"] !== "485517411")
-      );
-    }
     return {
       abstracts: abstractDefinitions,
       definitions: importListDefs
@@ -35264,7 +35265,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.30.0-next.5") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.30.0-next.7") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -46709,7 +46710,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           beforeinput(view, e) {
             let inputType = e.inputType;
             let command2 = inputType == "historyUndo" ? undo$1 : inputType == "historyRedo" ? redo$1 : null;
-            if (!command2)
+            if (!command2 || !view.editable)
               return false;
             e.preventDefault();
             return command2(view.state, view.dispatch);
@@ -60327,7 +60328,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexDuZ0Zcpx),
+        Promise.resolve().then(() => indexK8x_ZMJI),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -60545,7 +60546,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * @returns {Object | void} Migration results
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.30.0-next.5");
+      console.debug("[checkVersionMigrations] Current editor version", "0.30.0-next.7");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -63141,12 +63142,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               content2 = node2.content;
             }
             const updatedNode = node2.type.create({ ...node2.attrs, ...options.attrs }, content2, node2.marks);
-            try {
-              updatedNode.check();
-            } catch {
-              console.error("Updated node does not conform to the schema");
-              return false;
-            }
             tr.replaceWith(posFrom, posTo, updatedNode);
           }
           return true;
@@ -64167,6 +64162,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const getSpacingStyleString = (spacing, marks, isListItem) => {
     let { before, after, line, lineRule, beforeAutospacing, afterAutospacing } = spacing;
     line = twipsToLines(line);
+    if (line != null && line < 1) {
+      line = 1;
+    }
     if (lineRule === "exact" && line) {
       line = String(line);
     }
@@ -64768,6 +64766,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (paragraphContext.tabHeight === void 0) {
         paragraphContext.tabHeight = calcTabHeight(blockParent2);
       }
+      if (paragraphContext.paragraphWidth === void 0) {
+        paragraphContext.paragraphWidth = getBlockNodeWidth(view, startPos);
+      }
       const indentWidth = paragraphContext.indentWidth;
       const hanging = twipsToPixels(Number(paragraphContext.indent.hanging) || 0);
       if (hanging > 0) {
@@ -64779,7 +64780,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (tabStops.length) {
         const tabStop = tabStops.find((stop) => stop.pos > currentWidth && stop.val !== "clear");
         if (tabStop) {
-          tabWidth = tabStop.pos - currentWidth;
+          tabWidth = Math.min(tabStop.pos, paragraphContext.paragraphWidth) - currentWidth;
           let val = tabStop.val;
           const aliases = { left: "start", right: "end" };
           if (aliases[val]) val = aliases[val];
@@ -64947,6 +64948,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return calculateIndentFallback(indentAttrs);
   }
+  function getBlockNodeWidth(view, blockStartPos) {
+    const blockDom = view.nodeDOM(blockStartPos - 1);
+    if (blockDom instanceof HTMLElement) {
+      const styles = window.getComputedStyle(blockDom);
+      const width = blockDom.clientWidth + parseFloat(styles.marginLeft || "0") + parseFloat(styles.marginRight || "0") + parseFloat(styles.borderLeftWidth || "0") + parseFloat(styles.borderRightWidth || "0") + parseFloat(styles.paddingLeft || "0") + parseFloat(styles.paddingRight || "0");
+      return width;
+    }
+    return defaultLineLength;
+  }
   function calculateIndentFallback(indentAttrs = {}) {
     if (!indentAttrs) return 0;
     const left2 = twipsToPixels(Number(indentAttrs.left) || 0);
@@ -65075,6 +65085,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (mutation.type === "attributes" && mutation.target === this.dom && mutation.attributeName === "style") {
         return true;
       }
+      if (mutation.type === "childList") {
+        if (this.marker && Array.from(mutation.removedNodes).includes(this.marker)) {
+          return true;
+        }
+        if (this.marker && Array.from(mutation.addedNodes).includes(this.marker)) {
+          return true;
+        }
+        if (this.separator && Array.from(mutation.removedNodes).includes(this.separator)) {
+          return true;
+        }
+        if (this.separator && Array.from(mutation.addedNodes).includes(this.separator)) {
+          return true;
+        }
+      }
       return false;
     }
     destroy() {
@@ -65114,10 +65138,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   createMarker_fn = function(markerText) {
     if (!this.marker) {
       this.marker = document.createElement("span");
+      this.dom.insertBefore(this.marker, this.contentDOM);
     }
     this.marker.contentEditable = "false";
     this.marker.className = "list-marker";
-    this.dom.insertBefore(this.marker, this.contentDOM);
     this.marker.textContent = markerText;
   };
   createSeparator_fn = function(suffix2) {
@@ -65125,7 +65149,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (this.separator == null || this.separator.tagName?.toLowerCase() !== "span") {
         this.separator?.parentNode?.removeChild(this.separator);
         this.separator = document.createElement("span");
-        this.dom.insertBefore(this.separator, this.contentDOM);
+        this.marker.after(this.separator);
       }
       this.separator.className = "sd-editor-tab";
       this.separator.contentEditable = "false";
@@ -65133,14 +65157,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (this.separator == null || this.separator.nodeType !== Node.TEXT_NODE) {
         this.separator?.parentNode?.removeChild(this.separator);
         this.separator = document.createTextNode(" ");
-        this.dom.insertBefore(this.separator, this.contentDOM);
+        this.marker.after(this.separator);
       }
       this.separator.textContent = " ";
     } else if (suffix2 === "nothing") {
       if (this.separator == null || this.separator.nodeType !== Node.TEXT_NODE) {
         this.separator?.parentNode?.removeChild(this.separator);
         this.separator = document.createTextNode("");
-        this.dom.insertBefore(this.separator, this.contentDOM);
+        this.marker.after(this.separator);
       }
       this.separator.textContent = "";
     }
@@ -65343,7 +65367,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         abstractIdMap[numId] = abstractId;
         const restartSetting = startsMap?.[numId]?.[level]?.restart;
         const startValue = startsMap?.[numId]?.[level]?.start ?? 1;
-        const levelData = countersMap?.[numId]?.[level] || {};
+        const levelData = abstractCountersMap?.[abstractId]?.[level] || {};
         let previousPos = null;
         let previousCount = startValue - 1;
         if (cacheEnabled) {
@@ -65515,13 +65539,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return p2;
   };
   const generateFromCustom = (path2, lvlText, customFormat) => {
-    if (customFormat !== "001, 002, 003, ...") return generateNumbering(path2, lvlText, String);
+    if (customFormat.match(/(?:[0]+\d,\s){3}\.{3}/) == null) return generateNumbering(path2, lvlText, String);
     const match = customFormat.match(/(\d+)/);
     if (!match) throw new Error("Invalid format string: no numeric pattern found");
     const sample = match[1];
     const digitCount = sample.length;
-    const index2 = path2.pop();
-    return String(index2).padStart(digitCount, "0");
+    return generateNumbering(path2, lvlText, (p2) => String(p2).padStart(digitCount, "0"));
   };
   const intToRoman = (num) => {
     const romanNumeralMap = [
@@ -65646,6 +65669,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
           let { lvlText, customFormat, listNumberingType, suffix: suffix2, justification, abstractId } = definitionDetails;
           let markerText = "";
+          listNumberingType = listNumberingType || "decimal";
           const count = numberingManager.calculateCounter(numId, level, pos, abstractId);
           numberingManager.setCounter(numId, level, pos, count, abstractId);
           const path2 = numberingManager.calculatePath(numId, level, pos);
@@ -102673,7 +102697,7 @@ ${reason}`);
     const processLoadedDocxComments = async ({ superdoc: superdoc2, editor, comments, documentId }) => {
       const document2 = superdocStore.getDocument(documentId);
       comments.forEach((comment2) => {
-        const htmlContent = getHTmlFromComment(comment2.textJson);
+        const htmlContent = getHtmlFromComment(comment2.textJson);
         if (!htmlContent && !comment2.trackedChange) {
           return;
         }
@@ -102686,12 +102710,13 @@ ${reason}`);
           isInternal: false,
           parentCommentId: comment2.parentCommentId,
           creatorName,
+          createdTime: comment2.createdTime,
           creatorEmail: comment2.creatorEmail,
           importedAuthor: {
             name: importedName,
             email: comment2.creatorEmail
           },
-          commentText: getHTmlFromComment(comment2.textJson),
+          commentText: getHtmlFromComment(comment2.textJson),
           resolvedTime: comment2.isDone ? Date.now() : null,
           resolvedByEmail: comment2.isDone ? comment2.creatorEmail : null,
           resolvedByName: comment2.isDone ? importedName : null,
@@ -102799,7 +102824,7 @@ ${reason}`);
         content: normalizedChildren
       };
     };
-    const getHTmlFromComment = (commentTextJson) => {
+    const getHtmlFromComment = (commentTextJson) => {
       if (!commentTextJson.content?.length) return;
       try {
         const normalizedContent = normalizeCommentForEditor(commentTextJson);
@@ -116625,7 +116650,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.30.0-next.5";
+      this.version = "0.30.0-next.7";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -119025,7 +119050,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexDuZ0Zcpx = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexK8x_ZMJI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));