@harbour-enterprises/superdoc 0.12.13 → 0.12.15

package/dist/superdoc.umd.js

@@ -26232,8 +26232,20 @@
     return router[type2](params2);
   }
   function translateBodyNode(params2) {
-    const sectPr = params2.bodyNode?.elements.find((n) => n.name === "w:sectPr") || {};
+    let sectPr = params2.bodyNode?.elements.find((n) => n.name === "w:sectPr") || {};
     if (params2.converter) {
+      const hasHeader = sectPr.elements.some((n) => n.name === "w:headerReference");
+      const hasDefaultHeader = params2.converter.headerIds?.default;
+      if (!hasHeader && hasDefaultHeader && !params2.editor.options.isHeaderOrFooter) {
+        const defaultHeader = generateDefaultHeaderFooter("header", params2.converter.headerIds?.default);
+        sectPr.elements.push(defaultHeader);
+      }
+      const hasFooter = sectPr.elements.some((n) => n.name === "w:footerReference");
+      const hasDefaultFooter = params2.converter.footerIds?.default;
+      if (!hasFooter && hasDefaultFooter && !params2.editor.options.isHeaderOrFooter) {
+        const defaultFooter = generateDefaultHeaderFooter("footer", params2.converter.footerIds?.default);
+        sectPr.elements.push(defaultFooter);
+      }
       const newMargins = params2.converter.pageStyles.pageMargins;
       const sectPrMargins = sectPr.elements.find((n) => n.name === "w:pgMar");
       const { attributes } = sectPrMargins;
@@ -26255,6 +26267,16 @@
       elements: [...elements, sectPr]
     };
   }
+  const generateDefaultHeaderFooter = (type2, id) => {
+    return {
+      "type": "element",
+      "name": `w:${type2}Reference`,
+      "attributes": {
+        "w:type": "default",
+        "r:id": id
+      }
+    };
+  };
   function translateParagraphNode(params2) {
     const elements = translateChildNodes(params2);
     const htmlAnnotationChild = elements.find((element) => element.name === "htmlAnnotation");
@@ -30553,6 +30575,7 @@
     return !!evenOdd;
   };
   const HYPERLINK_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
+  const HEADER_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";
   const _SuperConverter = class _SuperConverter2 {
     constructor(params2 = null) {
       __privateAdd$2(this, _SuperConverter_instances);
@@ -30623,7 +30646,7 @@
         return;
       }
     }
-    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.12.13") {
+    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.12.15") {
       const customLocation = "docProps/custom.xml";
       if (!docx[customLocation]) {
         docx[customLocation] = generateCustomXml();
@@ -30811,8 +30834,8 @@
         commentsRels = relationships;
       }
       this.convertedXml = { ...this.convertedXml, ...updatedXml };
-      __privateMethod$2(this, _SuperConverter_instances, exportProcessNewRelationships_fn).call(this, [...params2.relationships, ...commentsRels]);
-      __privateMethod$2(this, _SuperConverter_instances, exportProcessHeadersFooters_fn).call(this, { isFinalDoc });
+      const headFootRels = __privateMethod$2(this, _SuperConverter_instances, exportProcessHeadersFooters_fn).call(this, { isFinalDoc });
+      __privateMethod$2(this, _SuperConverter_instances, exportProcessNewRelationships_fn).call(this, [...params2.relationships, ...commentsRels, ...headFootRels]);
       storeSuperdocVersion(this.convertedXml);
       __privateMethod$2(this, _SuperConverter_instances, exportNumberingFile_fn).call(this, params2);
       return xml;
@@ -30872,8 +30895,9 @@
   exportProcessHeadersFooters_fn = function({ isFinalDoc = false }) {
     const relsData = this.convertedXml["word/_rels/document.xml.rels"];
     const relationships = relsData.elements.find((x) => x.name === "Relationships");
-    Object.entries(this.headers).forEach(([id, header]) => {
-      const fileName = relationships.elements.find((el) => el.attributes.Id === id)?.attributes.Target;
+    const newDocRels = [];
+    Object.entries(this.headers).forEach(([id, header], index2) => {
+      const fileName = relationships.elements.find((el) => el.attributes.Id === id)?.attributes.Target || `header${index2 + 1}.xml`;
       const headerEditor = this.headerEditors.find((item) => item.id === id);
       if (!headerEditor) return;
       const { result, params: params2 } = this.exportToXmlJson({
@@ -30887,7 +30911,27 @@
       });
       const bodyContent = result.elements[0].elements;
       const file = this.convertedXml[`word/${fileName}`];
-      file.elements[0].elements = bodyContent;
+      if (!file) {
+        this.convertedXml[`word/${fileName}`] = {
+          declaration: this.initialJSON?.declaration,
+          elements: [{
+            attributes: DEFAULT_DOCX_DEFS,
+            name: "w:hdr",
+            type: "element",
+            elements: []
+          }]
+        };
+        newDocRels.push({
+          type: "element",
+          name: "Relationship",
+          attributes: {
+            Id: id,
+            Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header",
+            Target: fileName
+          }
+        });
+      }
+      this.convertedXml[`word/${fileName}`].elements[0].elements = bodyContent;
       if (params2.relationships.length) {
         const relationships2 = this.convertedXml[`word/_rels/${fileName}.rels`]?.elements?.find((x) => x.name === "Relationships")?.elements || [];
         this.convertedXml[`word/_rels/${fileName}.rels`] = {
@@ -30905,8 +30949,8 @@
         };
       }
     });
-    Object.entries(this.footers).forEach(([id, footer]) => {
-      const fileName = relationships.elements.find((el) => el.attributes.Id === id)?.attributes.Target;
+    Object.entries(this.footers).forEach(([id, footer], index2) => {
+      const fileName = relationships.elements.find((el) => el.attributes.Id === id)?.attributes.Target || `footer${index2 + 1}.xml`;
       const footerEditor = this.footerEditors.find((item) => item.id === id);
       if (!footerEditor) return;
       const { result, params: params2 } = this.exportToXmlJson({
@@ -30920,7 +30964,27 @@
       });
       const bodyContent = result.elements[0].elements;
       const file = this.convertedXml[`word/${fileName}`];
-      file.elements[0].elements = bodyContent;
+      if (!file) {
+        this.convertedXml[`word/${fileName}`] = {
+          declaration: this.initialJSON?.declaration,
+          elements: [{
+            attributes: DEFAULT_DOCX_DEFS,
+            name: "w:ftr",
+            type: "element",
+            elements: []
+          }]
+        };
+        newDocRels.push({
+          type: "element",
+          name: "Relationship",
+          attributes: {
+            Id: id,
+            Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer",
+            Target: fileName
+          }
+        });
+      }
+      this.convertedXml[`word/${fileName}`].elements[0].elements = bodyContent;
       if (params2.relationships.length) {
         const relationships2 = this.convertedXml[`word/_rels/${fileName}.rels`]?.elements?.find((x) => x.name === "Relationships")?.elements || [];
         this.convertedXml[`word/_rels/${fileName}.rels`] = {
@@ -30938,6 +31002,7 @@
         };
       }
     });
+    return newDocRels;
   };
   exportProcessNewRelationships_fn = function(rels = []) {
     const relsData = this.convertedXml["word/_rels/document.xml.rels"];
@@ -30950,7 +31015,8 @@
       const existingTarget = relationships.elements.find((el) => el.attributes.Target === rel.attributes.Target);
       const isNewMedia = rel.attributes.Target?.startsWith("media/") && existingId.length > 6;
       const isNewHyperlink = rel.attributes.Type === HYPERLINK_RELATIONSHIP_TYPE && existingId.length > 6;
-      if (existingTarget && !isNewMedia && !isNewHyperlink) {
+      const isNewHeadFoot = rel.attributes.Type === HEADER_RELATIONSHIP_TYPE && existingId.length > 6;
+      if (existingTarget && !isNewMedia && !isNewHyperlink && !isNewHeadFoot) {
         return;
       }
       rel.attributes.Target = rel.attributes?.Target?.replace(/&/g, "&");
@@ -31046,7 +31112,7 @@
   function generateCustomXml() {
     return DEFAULT_CUSTOM_XML;
   }
-  function generateSuperdocVersion(pid = 2, version2 = "0.12.13") {
+  function generateSuperdocVersion(pid = 2, version2 = "0.12.15") {
     return {
       type: "element",
       name: "property",
@@ -33484,6 +33550,15 @@
         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("header") && !name.includes("footer")) return;
+        const hasExtensible = types2.elements?.some((el) => el.name === "Override" && el.attributes.PartName === `/${name}`);
+        const type2 = name.includes("header") ? "header" : "footer";
+        const extendedDef = `<Override PartName="/${name}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.${type2}+xml"/>`;
+        if (!hasExtensible) {
+          typesString += extendedDef;
+        }
+      });
       const beginningString = '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
       const updatedContentTypesXml = contentTypesXml.replace(beginningString, `${beginningString}${typesString}`);
       docx.file(contentTypesPath, updatedContentTypesXml);
@@ -46408,8 +46483,9 @@
     Object.keys(newXml).forEach((key) => {
       if (key.includes("header") || key.includes("footer")) {
         const fileIndex = docx.findIndex((item) => item.name === key);
-        if (fileIndex === -1) return;
-        docx.splice(fileIndex, 1);
+        if (fileIndex > -1) {
+          docx.splice(fileIndex, 1);
+        }
         docx.push({
           name: key,
           content: newXml[key]
@@ -48191,7 +48267,7 @@
      * @returns {Object | void} Migration results
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.12.13");
+      console.debug("[checkVersionMigrations] Current editor version", "0.12.15");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -48281,7 +48357,7 @@
     prepareForAnnotations(annotationValues = []) {
       const { tr } = this.state;
       const { dispatch } = this.view;
-      const newTr = AnnotatorServices.processTables({ editor: this, tr, annotationValues });
+      const newTr = AnnotatorServices.processTables({ state: this.state, tr, annotationValues });
       this.view.dispatch(newTr);
       AnnotatorServices.annotateHeadersAndFooters({ editor: this, annotationValues });
     }
@@ -59906,7 +59982,7 @@
         currentPageNumber++;
         const headerId2 = getHeaderFooterId(currentPageNumber, "headerIds", editor);
         header = createHeader(pageMargins, pageSize, sectionData, headerId2, editor);
-        footer = createFooter(pageMargins, pageSize, sectionData, footerId2, editor);
+        footer = createFooter(pageMargins, pageSize, sectionData, footerId2, editor, currentPageNumber - 1);
         const bufferHeight2 = pageHeightThreshold - actualBreakBottom;
         const { node: spacingNode2 } = createFinalPagePadding(bufferHeight2);
         const pageSpacer2 = Decoration.widget(breakPos, spacingNode2, { key: "stable-key" });
@@ -59921,7 +59997,7 @@
     const headerId = getHeaderFooterId(currentPageNumber, "headerIds", editor);
     const footerId = getHeaderFooterId(currentPageNumber, "footerIds", editor);
     header = createHeader(pageMargins, pageSize, sectionData, headerId, editor);
-    footer = createFooter(pageMargins, pageSize, sectionData, footerId, editor);
+    footer = createFooter(pageMargins, pageSize, sectionData, footerId, editor, currentPageNumber);
     const bufferHeight = pageHeightThreshold - lastNodeCoords.bottom;
     const { node: spacingNode } = createFinalPagePadding(bufferHeight);
     const pageSpacer = Decoration.widget(doc2.content.size, spacingNode, { key: "stable-key" });
@@ -59956,6 +60032,10 @@
     const headerHeight = Math.max(headerDef?.height || 0, minHeaderHeight) + headerOffset;
     const availableHeight = headerHeight - headerMargin;
     const editorContainer = document.createElement("div");
+    if (!headerId && !editor.converter.headerIds["default"]) {
+      headerId = "rId" + generateDocxRandomId();
+      editor.converter.headerIds["default"] = headerId;
+    }
     if (!editor.converter.headers[headerId]) {
       editor.converter.headers[headerId] = {
         type: "doc",
@@ -59963,24 +60043,21 @@
       };
     }
     const data = editor.converter.headers[headerId];
-    let editorSection;
-    if (data) {
-      editorSection = createHeaderFooterEditor({
-        editor,
-        data,
-        editorContainer,
-        appendToBody: false,
-        sectionId: headerId,
-        type: "header",
-        availableHeight
-      });
-      editorSection.setEditable(false, false);
-      editor.converter.headerEditors.push({
-        id: headerId,
-        editor: editorSection
-      });
-      broadcastEditorEvents(editor, editorSection);
-    }
+    const editorSection = createHeaderFooterEditor({
+      editor,
+      data,
+      editorContainer,
+      appendToBody: false,
+      sectionId: headerId,
+      type: "header",
+      availableHeight
+    });
+    editor.converter.headerEditors.push({
+      id: headerId,
+      editor: editorSection
+    });
+    editorSection.setEditable(false, false);
+    broadcastEditorEvents(editor, editorSection);
     editorContainer.className = "pagination-section-header";
     editorContainer.style.paddingTop = headerMargin + "px";
     editorContainer.style.paddingLeft = pageMargins.left * 96 + "px";
@@ -59999,26 +60076,40 @@
     const minFooterHeight = pageMargins.bottom * 96;
     const footerPaddingFromEdge = pageMargins.footer * 96;
     const footerHeight = Math.max(footerDef?.height || 0, minFooterHeight - footerPaddingFromEdge);
+    const sectionContainer = footerDef?.sectionContainer?.cloneNode(true);
+    const autoPageNumber = sectionContainer?.querySelector('span[data-id="auto-page-number"]');
+    if (autoPageNumber) {
+      const fontSize2 = autoPageNumber.previousElementSibling?.style?.fontSize || autoPageNumber.nextElementSibling?.style?.fontSize;
+      if (fontSize2) autoPageNumber.style.fontSize = fontSize2;
+      autoPageNumber.innerText = currentPageNumber;
+    }
     const editorContainer = document.createElement("div");
-    const data = editor.converter.footers[footerId];
-    let editorSection;
-    if (data) {
-      editorSection = createHeaderFooterEditor({
-        editor,
-        data,
-        editorContainer,
-        appendToBody: false,
-        sectionId: footerId,
-        type: "footer",
-        availableHeight: footerHeight
-      });
-      editor.converter.footerEditors.push({
-        id: footerId,
-        editor: editorSection
-      });
-      editorSection.setEditable(false, false);
-      broadcastEditorEvents(editor, editorSection);
+    if (!footerId && !editor.converter.footerIds["default"]) {
+      footerId = "rId" + generateDocxRandomId();
+      editor.converter.footerIds["default"] = footerId;
+    }
+    if (!editor.converter.footers[footerId]) {
+      editor.converter.footers[footerId] = {
+        type: "doc",
+        content: [{ type: "paragraph", content: [] }]
+      };
     }
+    const data = editor.converter.footers[footerId];
+    const editorSection = createHeaderFooterEditor({
+      editor,
+      data,
+      editorContainer,
+      appendToBody: false,
+      sectionId: footerId,
+      type: "footer",
+      availableHeight: footerHeight
+    });
+    editor.converter.footerEditors.push({
+      id: footerId,
+      editor: editorSection
+    });
+    editorSection.setEditable(false, false);
+    broadcastEditorEvents(editor, editorSection);
     editorContainer.className = "pagination-section-footer";
     editorContainer.style.height = footerHeight + "px";
     editorContainer.style.marginBottom = footerPaddingFromEdge + "px";
@@ -89285,7 +89376,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.12.13";
+      this.version = "0.12.15";
       console.debug("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config.superdocId || v4();
       this.colors = this.config.colors;