@harbour-enterprises/superdoc 0.12.36-next.3 → 0.12.36-next.5

package/dist/superdoc.umd.js

@@ -23434,7 +23434,6 @@
     if (Number.isNaN(value) || value === 0) return {};
     if (lineRule === "atLeast" && value < 1) return {};
     unit = unit ? unit : defaultUnit;
-    value += unit ? 4 : 0.2;
     return isObject2 ? { ["line-height"]: `${value}${unit}` } : `line-height: ${value}${unit}`;
   };
   const deobfuscateFont = (arrayBuffer, guidHex) => {
@@ -26661,7 +26660,10 @@
         if (Array.isArray(outputNode)) {
           const mapped = [];
           outputNode.forEach((el, index22) => {
-            mapped.push(...el.elements);
+            el.elements.forEach((element) => {
+              if (element.name === "w:pPr") return;
+              mapped.push(element);
+            });
             if (index22 < outputNode.length - 1) mapped.push({ name: "w:br", type: "element" });
           });
           mapped.unshift(carbonCopy(pPr));
@@ -29415,7 +29417,12 @@
     return indent;
   };
   const getParagraphSpacing = (node2, docx, styleId = "", marks = []) => {
-    const spacing = {};
+    const spacing = {
+      lineSpaceAfter: 0,
+      lineSpaceBefore: 0,
+      line: 0,
+      lineRule: null
+    };
     const { spacing: pDefaultSpacing = {} } = getDefaultParagraphStyle(docx, styleId);
     let lineSpaceAfter, lineSpaceBefore, line, lineRuleStyle;
     const pPr = node2.elements?.find((el) => el.name === "w:pPr");
@@ -30664,7 +30671,7 @@
         return;
       }
     }
-    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.12.36-next.3") {
+    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.12.36-next.5") {
       const customLocation = "docProps/custom.xml";
       if (!docx[customLocation]) {
         docx[customLocation] = generateCustomXml();
@@ -31131,7 +31138,7 @@
   function generateCustomXml() {
     return DEFAULT_CUSTOM_XML;
   }
-  function generateSuperdocVersion(pid = 2, version2 = "0.12.36-next.3") {
+  function generateSuperdocVersion(pid = 2, version2 = "0.12.36-next.5") {
     return {
       type: "element",
       name: "property",
@@ -47604,27 +47611,30 @@
         (node22) => node22.type.name === "listItem"
       );
       if (!listItem) return;
-      if (listItem.node.childCount !== 1) {
-        let remainingNodes = listItem.node.childCount;
-        let matchingNodesFound = 0;
-        let hasOtherNodes = false;
-        listItem.node.children.forEach((child, index2) => {
-          const { type: type2 } = child;
-          if (type2.name !== "paragraph") return;
-          child.children.forEach((inline) => {
-            const isFieldToDelete = fieldsToDelete.includes(inline.attrs.fieldId);
-            const isMatchingField = inline.type.name === "fieldAnnotation" && isFieldToDelete;
-            const isEmpty2 = inline.childCount === 0;
-            if (!isEmpty2 && !isMatchingField) hasOtherNodes = true;
-            if (isMatchingField) matchingNodesFound += 1;
-          });
-        });
-        if (!hasOtherNodes && matchingNodesFound > 0) {
-          remainingNodes -= matchingNodesFound;
-        }
-        if (remainingNodes > 0) {
-          return;
+      let remainingNodes = 0;
+      listItem.node.descendants((node22) => {
+        if (node22.type.name === "fieldAnnotation") {
+          remainingNodes += 1;
         }
+      });
+      let matchingNodesFound = 0;
+      let hasOtherNodes = false;
+      listItem.node.children.forEach((child, index2) => {
+        const { type: type2 } = child;
+        if (type2.name !== "paragraph" && type2.name !== "fieldAnnotation") return;
+        child.children.forEach((inline) => {
+          const isFieldToDelete = fieldsToDelete.includes(inline.attrs.fieldId);
+          const isMatchingField = inline.type.name === "fieldAnnotation" && isFieldToDelete;
+          const isEmpty2 = inline.childCount === 0;
+          if (!isEmpty2 && !isMatchingField) hasOtherNodes = true;
+          if (isMatchingField) matchingNodesFound += 1;
+        });
+      });
+      if (!hasOtherNodes && matchingNodesFound > 0) {
+        remainingNodes -= matchingNodesFound;
+      }
+      if (remainingNodes > 0) {
+        return;
       }
       let { pos, node: node2, depth } = listItem;
       let $pos = doc2.resolve(pos);
@@ -48468,7 +48478,7 @@
      * @returns {Object | void} Migration results
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.12.36-next.3");
+      console.debug("[checkVersionMigrations] Current editor version", "0.12.36-next.5");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -49233,7 +49243,14 @@
               parseDOM: (el) => el.style.lineHeight,
               renderDOM: (attrs) => {
                 if (!attrs.lineHeight) return {};
-                return { style: getLineHeightValueString(attrs.lineHeight, this.options.defaults.unit, attrs.spacing?.lineRule) };
+                const lineHeightStyle = getLineHeightValueString(
+                  attrs.lineHeight,
+                  this.options.defaults.unit,
+                  attrs.spacing?.lineRule
+                );
+                return {
+                  style: `${lineHeightStyle}`
+                };
               }
             }
           }
@@ -51158,7 +51175,9 @@
           renderDOM: (attrs) => {
             const { spacing } = attrs;
             if (!spacing) return {};
-            const style2 = getSpacingStyleString(spacing);
+            const spacingCopy = { ...spacing };
+            if (attrs.lineHeight) delete spacingCopy.line;
+            const style2 = getSpacingStyleString(spacingCopy);
             if (style2) return { style: style2 };
             return {};
           }
@@ -90020,7 +90039,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.12.36-next.3";
+      this.version = "0.12.36-next.5";
       console.debug("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config.superdocId || v4();
       this.colors = this.config.colors;