@harbour-enterprises/superdoc 0.15.5-next.2 → 0.15.5-next.4

package/dist/chunks/{super-editor.es-Bdf_jgkg.cjs → super-editor.es-B26cbPcK.cjs}

@@ -26653,6 +26653,9 @@ function translateFieldAnnotation(params2) {
   if (!annotationHandler) return {};
   let processedNode;
   let sdtContentElements;
+  if ((attrs.type === "image" || attrs.type === "signature") && !attrs.hash) {
+    attrs.hash = generateDocxRandomId(4);
+  }
   if (isFinalDoc) {
     return annotationHandler(params2);
   } else {
@@ -26674,7 +26677,8 @@ function translateFieldAnnotation(params2) {
     fieldFontFamily: attrs.fontFamily,
     fieldFontSize: attrs.fontSize,
     fieldTextColor: attrs.textColor,
-    fieldTextHighlight: attrs.textHighlight
+    fieldTextHighlight: attrs.textHighlight,
+    hash: attrs.hash
   };
   const annotationAttrsJson = JSON.stringify(annotationAttrs);
   const result = {
@@ -27742,7 +27746,8 @@ const handleAnnotationNode = (params2) => {
       fontFamily: parsedAttrs.fieldFontFamily,
       fontSize: parsedAttrs.fieldFontSize,
       textColor: parsedAttrs.fieldTextColor,
-      textHighlight: parsedAttrs.fieldTextHighlight
+      textHighlight: parsedAttrs.fieldTextHighlight,
+      hash: parsedAttrs.hash
     };
     attrs = attrsFromJSON;
   } else {
@@ -27751,7 +27756,7 @@ const handleAnnotationNode = (params2) => {
   }
   const { attrs: marksAsAttrs, marks } = parseAnnotationMarks(sdtContent);
   const allAttrs = { ...attrs, ...marksAsAttrs };
-  allAttrs.hash = generateDocxRandomId(4);
+  if (!allAttrs.hash) allAttrs.hash = generateDocxRandomId(4);
   if (!attrs.fieldId || !attrs.displayLabel) {
     return { nodes: [], consumed: 0 };
   }
@@ -28795,7 +28800,7 @@ const _SuperConverter = class _SuperConverter2 {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version2 = "0.15.5-next.2") {
+  static updateDocumentVersion(docx = this.convertedXml, version2 = "0.15.5-next.4") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -29190,7 +29195,7 @@ exportProcessNewRelationships_fn = function(rels = []) {
 exportProcessMediaFiles_fn = async function(media, editor) {
   const processedData = {};
   for (const filePath in media) {
-    if (typeof media[filePath] !== "string") return;
+    if (typeof media[filePath] !== "string") continue;
     const name = filePath.split("/").pop();
     processedData[name] = await getArrayBufferFromUrl(media[filePath], editor.options.isHeadless);
   }
@@ -29274,7 +29279,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version2 = "0.15.5-next.2") {
+function generateSuperdocVersion(pid = 2, version2 = "0.15.5-next.4") {
   return {
     type: "element",
     name: "property",
@@ -34430,7 +34435,7 @@ const restoreSelection = () => ({ editor, state: state2, tr }) => {
     editor.view.dispatch(selectionTr);
   }
 };
-const commands = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const commands$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   clearNodes,
   command,
@@ -34480,7 +34485,7 @@ const commands = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
 const Commands = Extension.create({
   name: "commands",
   addCommands() {
-    return { ...commands };
+    return { ...commands$1 };
   }
 });
 const handleEnter = (editor) => {
@@ -44034,65 +44039,6 @@ const resetHeaderFooterFieldAnnotations = ({ editor }) => {
     onHeaderFooterDataUpdate({ editor: sectionEditor }, editor, sectionId, type2);
   });
 };
-const cleanUpListsWithAnnotations = (fieldsToDelete = [], editor) => {
-  if (!Array.isArray(fieldsToDelete)) fieldsToDelete = [fieldsToDelete];
-  const { doc: doc2 } = editor.state;
-  const docxAnnotations = getAllFieldAnnotations(editor.state) || [];
-  const nodesToDelete = [];
-  fieldsToDelete.forEach((fieldId) => {
-    const matched = docxAnnotations.find((a) => a.node.attrs.fieldId === fieldId);
-    if (!matched) return;
-    const listItem = findParentNodeClosestToPos(doc2.resolve(matched.pos), (node22) => node22.type.name === "listItem");
-    if (!listItem) 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 isFieldType = inline.type.name === "fieldAnnotation";
-        const isMatchingField = isFieldType && isFieldToDelete;
-        if (!isFieldType && !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);
-    while (depth > 0) {
-      const parent = $pos.node(depth - 1);
-      if (parent.childCount === 1) {
-        depth -= 1;
-        pos = $pos.before(depth);
-        node2 = parent;
-        $pos = doc2.resolve(pos);
-      } else {
-        break;
-      }
-    }
-    if (!nodesToDelete.some((n) => n.pos === pos)) {
-      nodesToDelete.push({ pos, node: node2 });
-    }
-  });
-  if (!nodesToDelete.length) return;
-  const tr = editor.state.tr;
-  nodesToDelete.sort((a, b) => b.pos - a.pos).forEach(({ pos, node: node2 }) => {
-    tr.delete(pos, pos + node2.nodeSize);
-  });
-  editor.view.dispatch(tr);
-};
 const AnnotatorHelpers = {
   getFieldAttrs,
   processTables,
@@ -44101,8 +44047,7 @@ const AnnotatorHelpers = {
   getAllHeaderFooterEditors,
   updateHeaderFooterFieldAnnotations,
   deleteHeaderFooterFieldAnnotations,
-  resetHeaderFooterFieldAnnotations,
-  cleanUpListsWithAnnotations
+  resetHeaderFooterFieldAnnotations
 };
 const CollaborationPluginKey = new PluginKey("collaboration");
 const Collaboration = Extension.create({
@@ -45457,7 +45402,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @returns {Object | void} Migration results
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.15.5-next.2");
+    console.debug("[checkVersionMigrations] Current editor version", "0.15.5-next.4");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -52044,6 +51989,99 @@ function toHex(color) {
   };
   return `#${hex2(r2)}${hex2(g)}${hex2(b)}${a < 1 ? hex2(Math.round(a * 255)) : ""}`;
 }
+const cleanUpListsWithAnnotations = (fieldsToDelete = []) => ({ dispatch, tr, state: state2 }) => {
+  if (!dispatch) return true;
+  if (!Array.isArray(fieldsToDelete)) fieldsToDelete = [fieldsToDelete];
+  const { doc: doc2 } = state2;
+  const docxAnnotations = getAllFieldAnnotations(state2) || [];
+  const nodesToDelete = [];
+  fieldsToDelete.forEach((fieldId) => {
+    const matched = docxAnnotations.find((a) => a.node.attrs.fieldId === fieldId);
+    if (!matched) return;
+    const listItem = findParentNodeClosestToPos(doc2.resolve(matched.pos), (node22) => node22.type.name === "listItem");
+    if (!listItem) 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 isFieldType = inline.type.name === "fieldAnnotation";
+        const isMatchingField = isFieldType && isFieldToDelete;
+        if (!isFieldType && !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);
+    while (depth > 0) {
+      const parent = $pos.node(depth - 1);
+      if (parent.childCount === 1) {
+        depth -= 1;
+        pos = $pos.before(depth);
+        node2 = parent;
+        $pos = doc2.resolve(pos);
+      } else {
+        break;
+      }
+    }
+    if (!nodesToDelete.some((n) => n.pos === pos)) {
+      nodesToDelete.push({ pos, node: node2 });
+    }
+  });
+  if (!nodesToDelete.length) return true;
+  nodesToDelete.sort((a, b) => b.pos - a.pos).forEach(({ pos, node: node2 }) => {
+    tr.delete(pos, pos + node2.nodeSize);
+  });
+  tr.setMeta("updateListSync", true);
+  return true;
+};
+const cleanUpListsCommands = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  cleanUpListsWithAnnotations
+}, Symbol.toStringTag, { value: "Module" }));
+const cleanUpParagraphWithAnnotations = (fieldsToDelete = []) => ({ dispatch, tr, state: state2 }) => {
+  if (!dispatch) return true;
+  const annotations = findFieldAnnotationsByFieldId(fieldsToDelete, state2) || [];
+  const nodesToDelete = [];
+  const { doc: doc2 } = state2;
+  annotations.forEach((annotation) => {
+    let { pos, node: node2 } = annotation;
+    let newPosFrom = tr.mapping.map(pos);
+    const resolvedPos = doc2.resolve(newPosFrom);
+    const parent = resolvedPos.parent;
+    let currentNode = tr.doc.nodeAt(newPosFrom);
+    if (node2.eq(currentNode) && parent?.children?.length < 2) {
+      nodesToDelete.push({ pos: newPosFrom, node: parent });
+    }
+  });
+  if (!nodesToDelete.length) return true;
+  nodesToDelete.sort((a, b) => b.pos - a.pos).forEach(({ pos, node: node2 }) => {
+    tr.delete(pos, pos + node2.nodeSize);
+  });
+  return true;
+};
+const cleanUpParagraphCommands = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  cleanUpParagraphWithAnnotations
+}, Symbol.toStringTag, { value: "Module" }));
+const commands = {
+  ...cleanUpListsCommands,
+  ...cleanUpParagraphCommands
+};
 const annotationClass = "annotation";
 const annotationContentClass = "annotation-content";
 const FieldAnnotation = Node$1.create({
@@ -52433,12 +52471,12 @@ const FieldAnnotation = Node$1.create({
           currentMarks = currentMarks.length ? [...currentMarks] : null;
           let formatAttrs = getFormatAttrsFromMarks(currentMarks);
           let defaultDisplayLabel = attrs.defaultDisplayLabel ? attrs.defaultDisplayLabel : attrs.displayLabel || "";
-          attrs.hash = generateDocxRandomId(4);
           let node2 = schema.nodes[this.name].create(
             {
               ...attrs,
               ...formatAttrs,
-              defaultDisplayLabel
+              defaultDisplayLabel,
+              hash: attrs.hash || generateDocxRandomId(4)
             },
             null,
             null
@@ -52479,7 +52517,8 @@ const FieldAnnotation = Node$1.create({
           let node2 = schema.nodes[this.name].create(
             {
               ...attrs,
-              defaultDisplayLabel
+              defaultDisplayLabel,
+              hash: attrs.hash || generateDocxRandomId(4)
             },
             null,
             null
@@ -52563,7 +52602,8 @@ const FieldAnnotation = Node$1.create({
                 // reset attrs for specific types.
                 imageSrc: null,
                 rawHtml: null,
-                linkUrl: null
+                linkUrl: null,
+                hash: null
               });
             }
           });
@@ -52924,8 +52964,10 @@ const FieldAnnotation = Node$1.create({
           }
         }
         return true;
-      }
+      },
       /// Formatting commands - end.
+      // Clean up commands (after field deletion)
+      ...commands
     };
   },
   addNodeView() {
@@ -71303,7 +71345,7 @@ function requireEventemitter3() {
       if (listeners.fn) return 1;
       return listeners.length;
     };
-    EventEmitter22.prototype.emit = function emit(event, a1, a22, a3, a4, a52) {
+    EventEmitter22.prototype.emit = function emit(event, a12, a2, a3, a42, a5) {
       var evt = prefix2 ? prefix2 + event : event;
       if (!this._events[evt]) return false;
       var listeners = this._events[evt], len = arguments.length, args, i2;
@@ -71313,15 +71355,15 @@ function requireEventemitter3() {
           case 1:
             return listeners.fn.call(listeners.context), true;
           case 2:
-            return listeners.fn.call(listeners.context, a1), true;
+            return listeners.fn.call(listeners.context, a12), true;
           case 3:
-            return listeners.fn.call(listeners.context, a1, a22), true;
+            return listeners.fn.call(listeners.context, a12, a2), true;
           case 4:
-            return listeners.fn.call(listeners.context, a1, a22, a3), true;
+            return listeners.fn.call(listeners.context, a12, a2, a3), true;
           case 5:
-            return listeners.fn.call(listeners.context, a1, a22, a3, a4), true;
+            return listeners.fn.call(listeners.context, a12, a2, a3, a42), true;
           case 6:
-            return listeners.fn.call(listeners.context, a1, a22, a3, a4, a52), true;
+            return listeners.fn.call(listeners.context, a12, a2, a3, a42, a5), true;
         }
         for (i2 = 1, args = new Array(len - 1); i2 < len; i2++) {
           args[i2 - 1] = arguments[i2];
@@ -71336,13 +71378,13 @@ function requireEventemitter3() {
               listeners[i2].fn.call(listeners[i2].context);
               break;
             case 2:
-              listeners[i2].fn.call(listeners[i2].context, a1);
+              listeners[i2].fn.call(listeners[i2].context, a12);
               break;
             case 3:
-              listeners[i2].fn.call(listeners[i2].context, a1, a22);
+              listeners[i2].fn.call(listeners[i2].context, a12, a2);
               break;
             case 4:
-              listeners[i2].fn.call(listeners[i2].context, a1, a22, a3);
+              listeners[i2].fn.call(listeners[i2].context, a12, a2, a3);
               break;
             default:
               if (!args) for (j2 = 1, args = new Array(len - 1); j2 < len; j2++) {