@harbour-enterprises/superdoc 0.8.11 → 0.8.12

package/dist/chunks/{super-editor.es-DIeHC3Si.js → super-editor.es-D8IC7SPE.js}

@@ -20664,7 +20664,7 @@ const _SuperConverter = class _SuperConverter2 {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.8.11") {
+  static updateDocumentVersion(docx = this.convertedXml, version = "0.8.12") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -20937,7 +20937,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version = "0.8.11") {
+function generateSuperdocVersion(pid = 2, version = "0.8.12") {
   return {
     type: "element",
     name: "property",
@@ -33986,199 +33986,6 @@ const getTrackChangesDecorations = (state2, onlyOriginalShown, onlyModifiedShown
   });
   return DecorationSet.create(state2.doc, decorations);
 };
-const replaceStep = ({ state: state2, tr, step, newTr, map: map22, doc: doc2, user, date, originalStep, originalStepIndex }) => {
-  const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName];
-  const deletionMark = findMark(state2, deletionMarkSchema, false);
-  const positionTo = deletionMark ? deletionMark.to : step.to;
-  const newStep = new ReplaceStep(
-    positionTo,
-    // We insert all the same steps, but with "from"/"to" both set to "to" in order not to delete content. Mapped as needed.
-    positionTo,
-    step.slice,
-    step.structure
-  );
-  const invertStep = originalStep.invert(tr.docs[originalStepIndex]).map(map22);
-  map22.appendMap(invertStep.getMap());
-  const meta = {};
-  if (newStep) {
-    const trTemp = state2.apply(newTr).tr;
-    if (trTemp.maybeStep(newStep).failed) {
-      return;
-    }
-    const mappedNewStepTo = newStep.getMap().map(newStep.to);
-    const insertedMark = markInsertion({
-      tr: trTemp,
-      from: newStep.from,
-      to: mappedNewStepTo,
-      user,
-      date
-    });
-    const condensedStep = new ReplaceStep(newStep.from, newStep.to, trTemp.doc.slice(newStep.from, mappedNewStepTo));
-    newTr.step(condensedStep);
-    const mirrorIndex = map22.maps.length - 1;
-    map22.appendMap(condensedStep.getMap(), mirrorIndex);
-    if (newStep.from !== mappedNewStepTo) {
-      meta.insertedMark = insertedMark;
-      meta.step = condensedStep;
-    }
-    if (!newTr.selection.eq(trTemp.selection)) {
-      newTr.setSelection(trTemp.selection);
-    }
-  }
-  if (step.from !== step.to) {
-    const { deletionMark: deletionMark2, deletionMap, nodes: deletionNodes } = markDeletion({
-      tr: newTr,
-      from: step.from,
-      to: step.to,
-      user,
-      date
-    });
-    meta.deletionNodes = deletionNodes;
-    meta.deletionMark = deletionMark2;
-    map22.appendMapping(deletionMap);
-  }
-  newTr.setMeta(TrackChangesBasePluginKey, meta);
-};
-const markWrapping = () => {
-};
-const replaceAroundStep = () => {
-};
-const addMarkStep = ({ state: state2, tr, step, newTr, map: map22, doc: doc2, user, date }) => {
-  const meta = {};
-  doc2.nodesBetween(step.from, step.to, (node2, pos) => {
-    if (!node2.isInline) {
-      return;
-    }
-    if (node2.marks.find((mark) => mark.type.name === TrackDeleteMarkName)) {
-      return false;
-    }
-    const existingChangeMark = node2.marks.find((mark) => [TrackDeleteMarkName, TrackFormatMarkName].includes(mark.type.name));
-    const wid = existingChangeMark ? existingChangeMark.attrs.id : v4();
-    newTr.addMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), step.mark);
-    const allowedMarks = ["bold", "italic", "strike", "underline", "textStyle"];
-    if (allowedMarks.includes(step.mark.type.name) && !node2.marks.find((mark) => mark.type === step.mark.type)) {
-      const formatChangeMark = node2.marks.find((mark) => mark.type.name === TrackFormatMarkName);
-      let after = [];
-      let before = [];
-      if (formatChangeMark) {
-        let foundBefore = formatChangeMark.attrs.before.find((mark) => {
-          if (mark.type === "textStyle") {
-            return mark.type === step.mark.type.name && objectIncludes(mark.attrs, step.mark.attrs);
-          }
-          return mark.type === step.mark.type.name;
-        });
-        if (foundBefore) {
-          before = [...formatChangeMark.attrs.before.filter((mark) => mark.type !== step.mark.type.name)];
-          after = [...formatChangeMark.attrs.after];
-        } else {
-          before = [...formatChangeMark.attrs.before];
-          after = [
-            ...formatChangeMark.attrs.after,
-            {
-              type: step.mark.type.name,
-              attrs: { ...step.mark.attrs }
-            }
-          ];
-        }
-      } else {
-        before = node2.marks.map((mark) => ({
-          type: mark.type.name,
-          attrs: { ...mark.attrs }
-        }));
-        after = [
-          {
-            type: step.mark.type.name,
-            attrs: { ...step.mark.attrs }
-          }
-        ];
-      }
-      if (after.length || before.length) {
-        const newFormatMark = state2.schema.marks[TrackFormatMarkName].create({
-          id: wid,
-          author: user.name,
-          authorEmail: user.email,
-          date,
-          before,
-          after
-        });
-        newTr.addMark(
-          step.from,
-          // Math.max(step.from, pos)
-          step.to,
-          // Math.min(step.to, pos + node.nodeSize),
-          newFormatMark
-        );
-        meta.formatMark = newFormatMark;
-        meta.step = step;
-        newTr.setMeta(TrackChangesBasePluginKey, meta);
-      } else if (formatChangeMark) {
-        newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), formatChangeMark);
-      }
-    }
-  });
-};
-const removeMarkStep = ({ state: state2, tr, step, newTr, map: map22, doc: doc2, user, date }) => {
-  const meta = {};
-  doc2.nodesBetween(step.from, step.to, (node2, pos) => {
-    if (!node2.isInline) {
-      return true;
-    }
-    if (node2.marks.find((mark) => mark.type.name === TrackDeleteMarkName)) {
-      return false;
-    }
-    newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), step.mark);
-    const allowedMarks = ["bold", "italic", "strike", "underline", "textStyle"];
-    if (allowedMarks.includes(step.mark.type.name) && node2.marks.find((mark) => mark.type === step.mark.type)) {
-      const formatChangeMark = node2.marks.find((mark) => mark.type.name === TrackFormatMarkName);
-      let after = [];
-      let before = [];
-      if (formatChangeMark) {
-        let foundAfter = formatChangeMark.attrs.after.find((mark) => mark.type === step.mark.type.name);
-        if (foundAfter) {
-          after = [...formatChangeMark.attrs.after.filter((mark) => mark.type !== step.mark.type.name)];
-          before = [...formatChangeMark.attrs.before];
-        } else {
-          after = [...formatChangeMark.attrs.after];
-          before = [
-            ...formatChangeMark.attrs.before,
-            {
-              type: step.mark.type.name,
-              attrs: { ...step.mark.attrs }
-            }
-          ];
-        }
-      } else {
-        after = [];
-        before = [
-          {
-            type: step.mark.type.name,
-            attrs: { ...step.mark.attrs }
-          }
-        ];
-      }
-      if (after.length || before.length) {
-        const newFormatMark = state2.schema.marks[TrackFormatMarkName].create({
-          id: v4(),
-          author: user.name,
-          authorEmail: user.email,
-          date,
-          before,
-          after
-        });
-        newTr.addMark(
-          Math.max(step.from, pos),
-          Math.min(step.to, pos + node2.nodeSize),
-          newFormatMark
-        );
-        meta.formatMark = newFormatMark;
-        meta.step = step;
-        newTr.setMeta(TrackChangesBasePluginKey, meta);
-      } else if (formatChangeMark) {
-        newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), formatChangeMark);
-      }
-    }
-  });
-};
 const CommentMarkName = "commentMark";
 const removeCommentsById = ({ commentId, state: state2, tr, dispatch }) => {
   const positions = getCommentPositionsById(commentId, state2.doc);
@@ -34585,7 +34392,7 @@ const CommentsPlugin = Extension.create({
           update(view, prevState) {
             const { state: state2 } = view;
             const { doc: doc2, tr } = state2;
-            if (prevDoc && prevDoc.eq(doc2)) shouldUpdate = true;
+            if (prevDoc && !prevDoc.eq(doc2)) shouldUpdate = true;
             if (!shouldUpdate) return;
             prevDoc = doc2;
             shouldUpdate = false;
@@ -34619,10 +34426,14 @@ const CommentsPlugin = Extension.create({
                 if (hasActive && activeThreadId !== threadId) return;
                 decorations.push(deco);
               });
-              const trackedChangeNode = getTrackedChangeNode(node2);
-              if (trackedChangeNode) {
+              const trackedChangeMark = findTrackedMark({
+                doc: doc2,
+                from: pos,
+                to: pos + node2.nodeSize
+              });
+              if (trackedChangeMark) {
                 const currentBounds = view.coordsAtPos(pos);
-                const { id } = trackedChangeNode.attrs;
+                const { id } = trackedChangeMark.mark.attrs;
                 updatePosition({
                   allCommentPositions,
                   threadId: id,
@@ -34690,9 +34501,13 @@ const getActiveCommentId = (doc2, selection) => {
   if ($from.pos !== $to.pos) return;
   const nodeAtPos = doc2.nodeAt($from.pos);
   if (!nodeAtPos) return;
-  const trackedChangeNode = getTrackedChangeNode(nodeAtPos);
-  if (trackedChangeNode) {
-    return trackedChangeNode.attrs.id;
+  const trackedChangeMark = findTrackedMark({
+    doc: doc2,
+    from: $from.pos,
+    to: $to.pos
+  });
+  if (trackedChangeMark) {
+    return trackedChangeMark.mark.attrs.id;
   }
   const overlaps = [];
   let found2 = false;
@@ -34729,13 +34544,30 @@ const getActiveCommentId = (doc2, selection) => {
   const closestCommentMark = closestMarks.find((mark) => mark.type.name === CommentMarkName);
   return closestCommentMark?.attrs?.commentId || closestCommentMark?.attrs?.importedId;
 };
-const getTrackedChangeNode = (node2) => {
-  if (!node2) return;
-  const nodeMarks = node2.marks;
-  const trackedInsertMark = nodeMarks?.find((mark) => mark.type.name === TrackInsertMarkName);
-  const trackedDeleteMark = nodeMarks?.find((mark) => mark.type.name === TrackDeleteMarkName);
-  const trackedFormatMark = nodeMarks?.find((mark) => mark.type.name === TrackFormatMarkName);
-  return trackedInsertMark || trackedDeleteMark || trackedFormatMark;
+const findTrackedMark = ({
+  doc: doc2,
+  from: from2,
+  to,
+  offset: offset2 = 1
+  // To get non-inclusive marks. 
+}) => {
+  const startPos = Math.max(from2 - offset2, 0);
+  const endPos = Math.min(to + offset2, doc2.content.size);
+  let markFound;
+  doc2.nodesBetween(startPos, endPos, (node2, pos) => {
+    if (!node2 || node2?.nodeSize === void 0) {
+      return;
+    }
+    const mark = node2.marks.find((mark2) => TRACK_CHANGE_MARKS.includes(mark2.type.name));
+    if (mark && !markFound) {
+      markFound = {
+        from: pos,
+        to: pos + node2.nodeSize,
+        mark
+      };
+    }
+  });
+  return markFound;
 };
 const handleTrackedChangeTransaction = (trackedChangeMeta, trackedChanges, newEditorState, editor) => {
   const {
@@ -34875,6 +34707,202 @@ function findNode$1(node2, predicate) {
   });
   return found2;
 }
+const replaceStep = ({ state: state2, tr, step, newTr, map: map22, doc: doc2, user, date, originalStep, originalStepIndex }) => {
+  const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName];
+  const deletionMark = findMark(state2, deletionMarkSchema, false);
+  const positionTo = deletionMark ? deletionMark.to : step.to;
+  const newStep = new ReplaceStep(
+    positionTo,
+    // We insert all the same steps, but with "from"/"to" both set to "to" in order not to delete content. Mapped as needed.
+    positionTo,
+    step.slice,
+    step.structure
+  );
+  const invertStep = originalStep.invert(tr.docs[originalStepIndex]).map(map22);
+  map22.appendMap(invertStep.getMap());
+  const meta = {};
+  if (newStep) {
+    const trTemp = state2.apply(newTr).tr;
+    if (trTemp.maybeStep(newStep).failed) {
+      return;
+    }
+    const mappedNewStepTo = newStep.getMap().map(newStep.to);
+    const insertedMark = markInsertion({
+      tr: trTemp,
+      from: newStep.from,
+      to: mappedNewStepTo,
+      user,
+      date
+    });
+    const condensedStep = new ReplaceStep(newStep.from, newStep.to, trTemp.doc.slice(newStep.from, mappedNewStepTo));
+    newTr.step(condensedStep);
+    const mirrorIndex = map22.maps.length - 1;
+    map22.appendMap(condensedStep.getMap(), mirrorIndex);
+    if (newStep.from !== mappedNewStepTo) {
+      meta.insertedMark = insertedMark;
+      meta.step = condensedStep;
+    }
+    if (!newTr.selection.eq(trTemp.selection)) {
+      newTr.setSelection(trTemp.selection);
+    }
+  }
+  if (step.from !== step.to) {
+    const { deletionMark: deletionMark2, deletionMap, nodes: deletionNodes } = markDeletion({
+      tr: newTr,
+      from: step.from,
+      to: step.to,
+      user,
+      date
+    });
+    meta.deletionNodes = deletionNodes;
+    meta.deletionMark = deletionMark2;
+    map22.appendMapping(deletionMap);
+  }
+  newTr.setMeta(TrackChangesBasePluginKey, meta);
+  newTr.setMeta(CommentsPluginKey, { type: "force" });
+};
+const markWrapping = () => {
+};
+const replaceAroundStep = () => {
+};
+const addMarkStep = ({ state: state2, tr, step, newTr, map: map22, doc: doc2, user, date }) => {
+  const meta = {};
+  doc2.nodesBetween(step.from, step.to, (node2, pos) => {
+    if (!node2.isInline) {
+      return;
+    }
+    if (node2.marks.find((mark) => mark.type.name === TrackDeleteMarkName)) {
+      return false;
+    }
+    const existingChangeMark = node2.marks.find((mark) => [TrackDeleteMarkName, TrackFormatMarkName].includes(mark.type.name));
+    const wid = existingChangeMark ? existingChangeMark.attrs.id : v4();
+    newTr.addMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), step.mark);
+    const allowedMarks = ["bold", "italic", "strike", "underline", "textStyle"];
+    if (allowedMarks.includes(step.mark.type.name) && !node2.marks.find((mark) => mark.type === step.mark.type)) {
+      const formatChangeMark = node2.marks.find((mark) => mark.type.name === TrackFormatMarkName);
+      let after = [];
+      let before = [];
+      if (formatChangeMark) {
+        let foundBefore = formatChangeMark.attrs.before.find((mark) => {
+          if (mark.type === "textStyle") {
+            return mark.type === step.mark.type.name && objectIncludes(mark.attrs, step.mark.attrs);
+          }
+          return mark.type === step.mark.type.name;
+        });
+        if (foundBefore) {
+          before = [...formatChangeMark.attrs.before.filter((mark) => mark.type !== step.mark.type.name)];
+          after = [...formatChangeMark.attrs.after];
+        } else {
+          before = [...formatChangeMark.attrs.before];
+          after = [
+            ...formatChangeMark.attrs.after,
+            {
+              type: step.mark.type.name,
+              attrs: { ...step.mark.attrs }
+            }
+          ];
+        }
+      } else {
+        before = node2.marks.map((mark) => ({
+          type: mark.type.name,
+          attrs: { ...mark.attrs }
+        }));
+        after = [
+          {
+            type: step.mark.type.name,
+            attrs: { ...step.mark.attrs }
+          }
+        ];
+      }
+      if (after.length || before.length) {
+        const newFormatMark = state2.schema.marks[TrackFormatMarkName].create({
+          id: wid,
+          author: user.name,
+          authorEmail: user.email,
+          date,
+          before,
+          after
+        });
+        newTr.addMark(
+          step.from,
+          // Math.max(step.from, pos)
+          step.to,
+          // Math.min(step.to, pos + node.nodeSize),
+          newFormatMark
+        );
+        meta.formatMark = newFormatMark;
+        meta.step = step;
+        newTr.setMeta(TrackChangesBasePluginKey, meta);
+        newTr.setMeta(CommentsPluginKey, { type: "force" });
+      } else if (formatChangeMark) {
+        newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), formatChangeMark);
+      }
+    }
+  });
+};
+const removeMarkStep = ({ state: state2, tr, step, newTr, map: map22, doc: doc2, user, date }) => {
+  const meta = {};
+  doc2.nodesBetween(step.from, step.to, (node2, pos) => {
+    if (!node2.isInline) {
+      return true;
+    }
+    if (node2.marks.find((mark) => mark.type.name === TrackDeleteMarkName)) {
+      return false;
+    }
+    newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), step.mark);
+    const allowedMarks = ["bold", "italic", "strike", "underline", "textStyle"];
+    if (allowedMarks.includes(step.mark.type.name) && node2.marks.find((mark) => mark.type === step.mark.type)) {
+      const formatChangeMark = node2.marks.find((mark) => mark.type.name === TrackFormatMarkName);
+      let after = [];
+      let before = [];
+      if (formatChangeMark) {
+        let foundAfter = formatChangeMark.attrs.after.find((mark) => mark.type === step.mark.type.name);
+        if (foundAfter) {
+          after = [...formatChangeMark.attrs.after.filter((mark) => mark.type !== step.mark.type.name)];
+          before = [...formatChangeMark.attrs.before];
+        } else {
+          after = [...formatChangeMark.attrs.after];
+          before = [
+            ...formatChangeMark.attrs.before,
+            {
+              type: step.mark.type.name,
+              attrs: { ...step.mark.attrs }
+            }
+          ];
+        }
+      } else {
+        after = [];
+        before = [
+          {
+            type: step.mark.type.name,
+            attrs: { ...step.mark.attrs }
+          }
+        ];
+      }
+      if (after.length || before.length) {
+        const newFormatMark = state2.schema.marks[TrackFormatMarkName].create({
+          id: v4(),
+          author: user.name,
+          authorEmail: user.email,
+          date,
+          before,
+          after
+        });
+        newTr.addMark(
+          Math.max(step.from, pos),
+          Math.min(step.to, pos + node2.nodeSize),
+          newFormatMark
+        );
+        meta.formatMark = newFormatMark;
+        meta.step = step;
+        newTr.setMeta(TrackChangesBasePluginKey, meta);
+        newTr.setMeta(CommentsPluginKey, { type: "force" });
+      } else if (formatChangeMark) {
+        newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), formatChangeMark);
+      }
+    }
+  });
+};
 const trackedTransaction = ({ tr, state: state2, user }) => {
   const onlyInputTypeMeta = ["inputType", "uiEvent", "paste", "pointer"];
   const notAllowedMeta = ["historyUndo", "historyRedo", "acceptReject"];
@@ -35472,7 +35500,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @returns {Y.Doc | undefined} Updated Y.Doc if any, otherwise undefined
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.8.11");
+    console.debug("[checkVersionMigrations] Current editor version", "0.8.12");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -59103,4 +59131,4 @@ export {
   helpers as m,
   index as n
 };
-//# sourceMappingURL=super-editor.es-DIeHC3Si.js.map
+//# sourceMappingURL=super-editor.es-D8IC7SPE.js.map