@harbour-enterprises/superdoc 0.22.0-next.4 → 0.22.0-next.5

package/dist/superdoc.umd.js

@@ -38345,6 +38345,51 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       gutter: "0"
     })
   });
+  const ensureSectionLayoutDefaults = (sectPr, converter) => {
+    if (!sectPr) {
+      return {
+        type: "element",
+        name: "w:sectPr",
+        elements: []
+      };
+    }
+    if (!sectPr.elements) sectPr.elements = [];
+    const ensureChild = (name) => {
+      let child = sectPr.elements.find((n) => n.name === name);
+      if (!child) {
+        child = {
+          type: "element",
+          name,
+          elements: [],
+          attributes: {}
+        };
+        sectPr.elements.push(child);
+      } else {
+        if (!child.elements) child.elements = [];
+        if (!child.attributes) child.attributes = {};
+      }
+      return child;
+    };
+    const pageSize = converter?.pageStyles?.pageSize;
+    const pgSz = ensureChild("w:pgSz");
+    if (pageSize?.width != null) pgSz.attributes["w:w"] = String(inchesToTwips(pageSize.width));
+    if (pageSize?.height != null) pgSz.attributes["w:h"] = String(inchesToTwips(pageSize.height));
+    if (pgSz.attributes["w:w"] == null) pgSz.attributes["w:w"] = DEFAULT_SECTION_PROPS_TWIPS.pageSize.width;
+    if (pgSz.attributes["w:h"] == null) pgSz.attributes["w:h"] = DEFAULT_SECTION_PROPS_TWIPS.pageSize.height;
+    const pageMargins = converter?.pageStyles?.pageMargins;
+    const pgMar = ensureChild("w:pgMar");
+    if (pageMargins) {
+      Object.entries(pageMargins).forEach(([key2, value]) => {
+        const converted = inchesToTwips(value);
+        if (converted != null) pgMar.attributes[`w:${key2}`] = String(converted);
+      });
+    }
+    Object.entries(DEFAULT_SECTION_PROPS_TWIPS.pageMargins).forEach(([key2, value]) => {
+      const attrKey = `w:${key2}`;
+      if (pgMar.attributes[attrKey] == null) pgMar.attributes[attrKey] = value;
+    });
+    return sectPr;
+  };
   const isLineBreakOnlyRun = (node) => {
     if (!node) return false;
     if (node.type === "lineBreak" || node.type === "hardBreak") return true;
@@ -38407,6 +38452,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     } else if (!sectPr.elements) {
       sectPr = { ...sectPr, elements: [] };
     }
+    sectPr = ensureSectionLayoutDefaults(sectPr, params2.converter);
     if (params2.converter) {
       const hasHeader = sectPr.elements?.some((n) => n.name === "w:headerReference");
       const hasDefaultHeader = params2.converter.headerIds?.default;
@@ -38420,40 +38466,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         const defaultFooter = generateDefaultHeaderFooter("footer", params2.converter.footerIds?.default);
         sectPr.elements.push(defaultFooter);
       }
-      const newMargins = params2.converter.pageStyles?.pageMargins;
-      if (newMargins) {
-        let sectPrMargins = sectPr.elements.find((n) => n.name === "w:pgMar");
-        if (!sectPrMargins) {
-          sectPrMargins = {
-            type: "element",
-            name: "w:pgMar",
-            attributes: {}
-          };
-          sectPr.elements.push(sectPrMargins);
-        } else if (!sectPrMargins.attributes) {
-          sectPrMargins.attributes = {};
-        }
-        Object.entries(newMargins).forEach(([key2, value]) => {
-          const convertedValue = inchesToTwips(value);
-          sectPrMargins.attributes[`w:${key2}`] = convertedValue;
-        });
-      }
-      let sectPrPgSz = sectPr.elements.find((n) => n.name === "w:pgSz");
-      if (!sectPrPgSz) {
-        sectPrPgSz = {
-          type: "element",
-          name: "w:pgSz",
-          attributes: {}
-        };
-        sectPr.elements.push(sectPrPgSz);
-      } else if (!sectPrPgSz.attributes) {
-        sectPrPgSz.attributes = {};
-      }
-      const pageSize = params2.converter.pageStyles?.pageSize;
-      const widthInches = pageSize?.width;
-      const heightInches = pageSize?.height;
-      sectPrPgSz.attributes["w:w"] = widthInches ? String(inchesToTwips(widthInches)) : sectPrPgSz.attributes["w:w"] ?? DEFAULT_SECTION_PROPS_TWIPS.pageSize.width;
-      sectPrPgSz.attributes["w:h"] = heightInches ? String(inchesToTwips(heightInches)) : sectPrPgSz.attributes["w:h"] ?? DEFAULT_SECTION_PROPS_TWIPS.pageSize.height;
     }
     const elements = translateChildNodes(params2);
     if (params2.isHeaderFooter) {
@@ -43982,14 +43994,19 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     /**
      * Update [Content_Types].xml with extensions of new Image annotations
      */
-    async updateContentTypes(docx, media, fromJson) {
+    async updateContentTypes(docx, media, fromJson, updatedDocs = {}) {
+      const additionalPartNames = Object.keys(updatedDocs || {});
       const newMediaTypes = Object.keys(media).map((name) => {
         return this.getFileExtension(name);
       }).filter(Boolean);
       const contentTypesPath = "[Content_Types].xml";
       let contentTypesXml;
       if (fromJson) {
-        contentTypesXml = docx.files.find((file) => file.name === contentTypesPath)?.content || "";
+        if (Array.isArray(docx.files)) {
+          contentTypesXml = docx.files.find((file) => file.name === contentTypesPath)?.content || "";
+        } else {
+          contentTypesXml = docx.files?.[contentTypesPath] || "";
+        }
       } else contentTypesXml = await docx.file(contentTypesPath).async("string");
       let typesString = "";
       const defaultMediaTypes = getContentTypesFromXml(contentTypesXml);
@@ -44015,24 +44032,39 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const hasCommentsExtensible = types2.elements?.some(
         (el) => el.name === "Override" && el.attributes.PartName === "/word/commentsExtensible.xml"
       );
-      if (docx.files["word/comments.xml"]) {
+      const hasFile = (filename) => {
+        if (!docx?.files) return false;
+        if (!fromJson) return Boolean(docx.files[filename]);
+        if (Array.isArray(docx.files)) return docx.files.some((file) => file.name === filename);
+        return Boolean(docx.files[filename]);
+      };
+      if (hasFile("word/comments.xml")) {
         const commentsDef = `<Override PartName="/word/comments.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml" />`;
         if (!hasComments) typesString += commentsDef;
       }
-      if (docx.files["word/commentsExtended.xml"]) {
+      if (hasFile("word/commentsExtended.xml")) {
         const commentsExtendedDef = `<Override PartName="/word/commentsExtended.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml" />`;
         if (!hasCommentsExtended) typesString += commentsExtendedDef;
       }
-      if (docx.files["word/commentsIds.xml"]) {
+      if (hasFile("word/commentsIds.xml")) {
         const commentsIdsDef = `<Override PartName="/word/commentsIds.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.commentsIds+xml" />`;
         if (!hasCommentsIds) typesString += commentsIdsDef;
       }
-      if (docx.files["word/commentsExtensible.xml"]) {
+      if (hasFile("word/commentsExtensible.xml")) {
         const commentsExtendedDef = `<Override PartName="/word/commentsExtensible.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtensible+xml" />`;
         if (!hasCommentsExtensible) typesString += commentsExtendedDef;
       }
-      Object.keys(docx.files).forEach((name) => {
-        if (name.includes(".rels") || !name.includes("header") && !name.includes("footer")) return;
+      const partNames = new Set(additionalPartNames);
+      if (docx?.files) {
+        if (fromJson && Array.isArray(docx.files)) {
+          docx.files.forEach((file) => partNames.add(file.name));
+        } else {
+          Object.keys(docx.files).forEach((key2) => partNames.add(key2));
+        }
+      }
+      partNames.forEach((name) => {
+        if (name.includes(".rels")) return;
+        if (!name.includes("header") && !name.includes("footer")) return;
         const hasExtensible = types2.elements?.some(
           (el) => el.name === "Override" && el.attributes.PartName === `/${name}`
         );
@@ -44043,7 +44075,48 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         }
       });
       const beginningString = '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
-      const updatedContentTypesXml = contentTypesXml.replace(beginningString, `${beginningString}${typesString}`);
+      let updatedContentTypesXml = contentTypesXml.replace(beginningString, `${beginningString}${typesString}`);
+      let relationshipsXml = updatedDocs["word/_rels/document.xml.rels"];
+      if (!relationshipsXml) {
+        if (fromJson) {
+          if (Array.isArray(docx.files)) {
+            relationshipsXml = docx.files.find((file) => file.name === "word/_rels/document.xml.rels")?.content;
+          } else {
+            relationshipsXml = docx.files?.["word/_rels/document.xml.rels"];
+          }
+        } else {
+          relationshipsXml = await docx.file("word/_rels/document.xml.rels")?.async("string");
+        }
+      }
+      if (relationshipsXml) {
+        try {
+          const relJson = xmljs.xml2js(relationshipsXml, { compact: false });
+          const relationships = relJson.elements?.find((el) => el.name === "Relationships");
+          relationships?.elements?.forEach((rel) => {
+            const type2 = rel.attributes?.Type;
+            const target = rel.attributes?.Target;
+            if (!type2 || !target) return;
+            const isHeader = type2.includes("/header");
+            const isFooter = type2.includes("/footer");
+            if (!isHeader && !isFooter) return;
+            let sanitizedTarget = target.replace(/^\.\//, "");
+            if (sanitizedTarget.startsWith("../")) sanitizedTarget = sanitizedTarget.slice(3);
+            if (sanitizedTarget.startsWith("/")) sanitizedTarget = sanitizedTarget.slice(1);
+            const partName = sanitizedTarget.startsWith("word/") ? sanitizedTarget : `word/${sanitizedTarget}`;
+            partNames.add(partName);
+          });
+        } catch (error) {
+          console.warn("Failed to parse document relationships while updating content types", error);
+        }
+      }
+      partNames.forEach((name) => {
+        if (name.includes(".rels")) return;
+        if (!name.includes("header") && !name.includes("footer")) return;
+        if (updatedContentTypesXml.includes(`PartName="/${name}"`)) return;
+        const type2 = name.includes("header") ? "header" : "footer";
+        const extendedDef = `<Override PartName="/${name}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.${type2}+xml"/>`;
+        updatedContentTypesXml = updatedContentTypesXml.replace("</Types>", `${extendedDef}</Types>`);
+      });
       if (fromJson) return updatedContentTypesXml;
       docx.file(contentTypesPath, updatedContentTypesXml);
     }
@@ -44084,7 +44157,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       for (const [fontName, fontUintArray] of Object.entries(fonts)) {
         zip.file(fontName, fontUintArray);
       }
-      await this.updateContentTypes(zip, media);
+      await this.updateContentTypes(zip, media, false, updatedDocs);
       return zip;
     }
     /**
@@ -44110,7 +44183,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       Object.keys(media).forEach((path) => {
         unzippedOriginalDocx.file(path, media[path]);
       });
-      await this.updateContentTypes(unzippedOriginalDocx, media);
+      await this.updateContentTypes(unzippedOriginalDocx, media, false, updatedDocs);
       return unzippedOriginalDocx;
     }
   }
@@ -58872,7 +58945,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               files: this.options.content
             },
             media,
-            true
+            true,
+            updatedDocs
           );
           return updatedDocs;
         }
@@ -61431,6 +61505,16 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return prefersNativeMenu(event);
   };
   const shouldBypassContextMenu = shouldAllowNativeContextMenu;
+  const DEFAULT_SELECTION_STATE = Object.freeze({
+    focused: false,
+    preservedSelection: null,
+    showVisualSelection: false,
+    skipFocusReset: false
+  });
+  const normalizeSelectionState = (state2 = {}) => ({
+    ...DEFAULT_SELECTION_STATE,
+    ...state2
+  });
   const CustomSelectionPluginKey = new PluginKey("CustomSelection");
   const handleClickOutside = (event, editor) => {
     const editorElem = editor?.options?.element;
@@ -61468,11 +61552,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const customSelectionPlugin = new Plugin({
         key: CustomSelectionPluginKey,
         state: {
-          init: () => ({
-            focused: false,
-            preservedSelection: null,
-            showVisualSelection: false
-          }),
+          init: () => ({ ...DEFAULT_SELECTION_STATE }),
           apply: (tr, value) => {
             const meta = getFocusMeta(tr);
             if (meta !== void 0) {
@@ -61503,7 +61583,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                   setFocusMeta(view.state.tr, {
                     focused: true,
                     preservedSelection: selection,
-                    showVisualSelection: true
+                    showVisualSelection: true,
+                    skipFocusReset: true
                   })
                 );
               }
@@ -61524,7 +61605,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                     setFocusMeta(view.state.tr, {
                       focused: true,
                       preservedSelection: selection2,
-                      showVisualSelection: true
+                      showVisualSelection: true,
+                      skipFocusReset: true
                     })
                   );
                   this.editor.setOptions({
@@ -61547,7 +61629,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                   setFocusMeta(view.state.tr, {
                     focused: true,
                     preservedSelection: selection,
-                    showVisualSelection: true
+                    showVisualSelection: true,
+                    skipFocusReset: false
                   })
                 );
                 this.editor.setOptions({
@@ -61565,7 +61648,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                     setFocusMeta(view.state.tr, {
                       focused: true,
                       preservedSelection: selection,
-                      showVisualSelection: true
+                      showVisualSelection: true,
+                      skipFocusReset: false
                     })
                   );
                 }
@@ -61576,7 +61660,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                   setFocusMeta(view.state.tr, {
                     focused: false,
                     preservedSelection: null,
-                    showVisualSelection: false
+                    showVisualSelection: false,
+                    skipFocusReset: false
                   })
                 );
                 if (!selection.empty && !this.editor.options.element?.contains(target)) {
@@ -61593,12 +61678,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               const isElement2 = target instanceof Element;
               const isToolbarBtn = isElement2 && isToolbarButton(target);
               const isToolbarInp = isElement2 && isToolbarInput(target);
+              const focusState = getFocusState(view.state);
+              if (focusState?.skipFocusReset) {
+                view.dispatch(
+                  setFocusMeta(view.state.tr, normalizeSelectionState({ ...focusState, skipFocusReset: false }))
+                );
+                return false;
+              }
               if (!isToolbarBtn && !isToolbarInp) {
                 view.dispatch(
                   setFocusMeta(view.state.tr, {
                     focused: false,
                     preservedSelection: null,
-                    showVisualSelection: false
+                    showVisualSelection: false,
+                    skipFocusReset: false
                   })
                 );
               }
@@ -61609,12 +61702,16 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               const isToolbarBtn = isElement2 && isToolbarButton(target);
               const isToolbarInp = isElement2 && isToolbarInput(target);
               const state2 = getFocusState(view.state);
+              if (state2?.skipFocusReset) {
+                return false;
+              }
               if (isToolbarBtn || isToolbarInp) {
                 view.dispatch(
                   setFocusMeta(view.state.tr, {
                     focused: true,
                     preservedSelection: state2.preservedSelection || view.state.selection,
-                    showVisualSelection: true
+                    showVisualSelection: true,
+                    skipFocusReset: false
                   })
                 );
               } else {
@@ -61622,7 +61719,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                   setFocusMeta(view.state.tr, {
                     focused: false,
                     preservedSelection: null,
-                    showVisualSelection: false
+                    showVisualSelection: false,
+                    skipFocusReset: false
                   })
                 );
               }