@harbour-enterprises/superdoc 0.22.0-next.7 → 0.22.0-next.9

package/dist/superdoc.umd.js

@@ -39980,8 +39980,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return { nodes: [], consumed: 0 };
     }
     const [pNode] = nodes;
-    const run2 = pNode.elements?.find((el) => el.name === "w:r");
-    const pict = run2?.elements?.find((el) => el.name === "w:pict");
+    const runs = pNode.elements?.filter((el) => el.name === "w:r") || [];
+    let pict = null;
+    for (const run2 of runs) {
+      const foundPict = run2.elements?.find((el) => el.name === "w:pict");
+      if (foundPict) {
+        pict = foundPict;
+        break;
+      }
+    }
     if (!pict) {
       return { nodes: [], consumed: 0 };
     }
@@ -56361,28 +56368,25 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (emitParams) editor.emit("commentsUpdate", emitParams);
     return newTrackedChanges;
   };
-  const getTrackedChangeText = ({ state: state2, node, mark, marks, trackedChangeType, isDeletionInsertion }) => {
+  const getTrackedChangeText = ({ state: state2, nodes, mark, marks, trackedChangeType, isDeletionInsertion }) => {
     let trackedChangeText = "";
     let deletionText = "";
     if (trackedChangeType === TrackInsertMarkName) {
-      trackedChangeText = node?.text ?? "";
+      trackedChangeText = nodes.reduce((acc, node) => {
+        if (!node.marks.find((nodeMark) => nodeMark.type.name === mark.type.name)) return acc;
+        acc += node?.text || node?.textContent || "";
+        return acc;
+      }, "");
     }
     if (trackedChangeType === TrackFormatMarkName) {
       trackedChangeText = translateFormatChangesToEnglish(mark.attrs);
     }
     if (trackedChangeType === TrackDeleteMarkName || isDeletionInsertion) {
-      deletionText = node?.text ?? "";
-      if (isDeletionInsertion) {
-        let { id } = marks.deletionMark.attrs;
-        let deletionNode = findNode$1(state2.doc, (node2) => {
-          const { marks: marks2 = [] } = node2;
-          const changeMarks = marks2.filter((mark2) => TRACK_CHANGE_MARKS.includes(mark2.type.name));
-          if (!changeMarks.length) return false;
-          const hasMatchingId = changeMarks.find((mark2) => mark2.attrs.id === id);
-          if (hasMatchingId) return true;
-        });
-        deletionText = deletionNode?.node.text ?? "";
-      }
+      deletionText = nodes.reduce((acc, node) => {
+        if (!node.marks.find((nodeMark) => nodeMark.type.name === TrackDeleteMarkName)) return acc;
+        acc += node?.text || node?.textContent || "";
+        return acc;
+      }, "");
     }
     return {
       deletionText,
@@ -56397,18 +56401,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const id = attrs.id;
     const node = nodes[0];
     const isDeletionInsertion = !!(marks.insertedMark && marks.deletionMark);
-    let existingNode;
+    let nodesWithMark = [];
     newEditorState.doc.descendants((node2) => {
       const { marks: marks2 = [] } = node2;
       const changeMarks = marks2.filter((mark) => TRACK_CHANGE_MARKS.includes(mark.type.name));
       if (!changeMarks.length) return;
       const hasMatchingId = changeMarks.find((mark) => mark.attrs.id === id);
-      if (hasMatchingId) existingNode = node2;
-      if (existingNode) return false;
+      if (hasMatchingId) nodesWithMark.push(node2);
     });
     const { deletionText, trackedChangeText } = getTrackedChangeText({
       state: newEditorState,
-      node: existingNode || node,
+      nodes: nodesWithMark.length ? nodesWithMark : [node],
       mark: trackedMark,
       marks,
       trackedChangeType,
@@ -56438,14 +56441,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     else if (event === "update") params2.event = comments_module_events$1.UPDATE;
     return params2;
   };
-  function findNode$1(node, predicate) {
-    let found2 = null;
-    node.descendants((node2, pos) => {
-      if (predicate(node2)) found2 = { node: node2, pos };
-      if (found2) return false;
-    });
-    return found2;
-  }
   function findRangeById(doc2, id) {
     let from2 = null, to = null;
     doc2.descendants((node, pos) => {
@@ -96731,7 +96726,7 @@ ${reason}`);
       const c1 = changes[i2];
       const c2 = changes[i2 + 1];
       const c1Key = markMetaKeys[c1.mark.type.name];
-      if (c1 && c2 && c1.to === c2.from) {
+      if (c1 && c2 && c1.to === c2.from && c1.mark.attrs.id === c2.mark.attrs.id) {
         const c2Key = markMetaKeys[c2.mark.type.name];
         grouped.push({
           from: c1.from,
@@ -96776,6 +96771,7 @@ ${reason}`);
     const isCommentsListVisible = ref$1(false);
     const editorCommentIds = ref$1([]);
     const editorCommentPositions = ref$1({});
+    const isCommentHighlighted = ref$1(false);
     const floatingCommentsOffset = ref$1(0);
     const sortedConversations = ref$1([]);
     const visibleConversations = ref$1([]);
@@ -97054,8 +97050,8 @@ ${reason}`);
           tr.setMeta(CommentsPluginKey, { type: "forceTrackChanges" });
           tr.setMeta(TrackChangesBasePluginKey, trackChangesPayload);
         }
+        dispatch(tr);
       });
-      dispatch(tr);
     };
     const translateCommentsForExport = () => {
       const processedComments = [];
@@ -97125,6 +97121,7 @@ ${reason}`);
       try {
         const normalizedContent = normalizeCommentForEditor(commentTextJson);
         const schemaContent = Array.isArray(normalizedContent) ? normalizedContent[0] : normalizedContent;
+        if (!schemaContent.content.length) return null;
         const editor = new Editor({
           mode: "text",
           isHeadless: true,
@@ -97158,6 +97155,7 @@ ${reason}`);
       commentsParentElement,
       editorCommentPositions,
       hasInitializedLocations,
+      isCommentHighlighted,
       // Floating comments
       floatingCommentsOffset,
       sortedConversations,
@@ -108852,7 +108850,8 @@ ${style2}
         currentCommentText,
         isDebugging: isDebugging2,
         editingCommentId,
-        editorCommentPositions
+        editorCommentPositions,
+        isCommentHighlighted
       } = storeToRefs(commentsStore);
       const { activeZoom } = storeToRefs(superdocStore);
       const isInternal = ref$1(true);
@@ -108914,13 +108913,14 @@ ${style2}
           "track-format",
           "track-format-dec"
         ];
-        if (excludedClasses.some((className) => e.target.classList.contains(className))) return;
+        if (excludedClasses.some((className) => e.target.classList.contains(className)) || isCommentHighlighted.value) return;
         if (activeComment.value === props.comment.commentId) {
           floatingCommentsOffset.value = 0;
           emit2("dialog-exit");
         }
         activeComment.value = null;
         commentsStore.setActiveComment(proxy.$superdoc, activeComment.value);
+        isCommentHighlighted.value = false;
       };
       const handleAddComment = () => {
         const options = {
@@ -109133,7 +109133,7 @@ ${style2}
       };
     }
   };
-  const CommentDialog = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-dc5e6675"]]);
+  const CommentDialog = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-e07f3426"]]);
   const _hoisted_1$b = { class: "comments-list" };
   const _hoisted_2$5 = { key: 0 };
   const _hoisted_3$3 = { class: "comment-item" };
@@ -110156,7 +110156,8 @@ ${style2}
         getFloatingComments,
         hasSyncedCollaborationComments,
         editorCommentPositions,
-        hasInitializedLocations
+        hasInitializedLocations,
+        isCommentHighlighted
       } = storeToRefs(commentsStore);
       const { showAddComment, handleEditorLocationsUpdate, handleTrackedChangeUpdate } = commentsStore;
       const { proxy } = getCurrentInstance();
@@ -110351,6 +110352,7 @@ ${style2}
         nextTick(() => {
           if (pendingComment.value) return;
           commentsStore.setActiveComment(proxy.$superdoc, activeCommentId);
+          isCommentHighlighted.value = true;
         });
         if (typeof proxy.$superdoc.config.onCommentsUpdate === "function") {
           proxy.$superdoc.config.onCommentsUpdate(params2);
@@ -110673,7 +110675,7 @@ ${style2}
       };
     }
   };
-  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-dbfba5b9"]]);
+  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-3f71b1bf"]]);
   const createSuperdocVueApp = () => {
     const app = createApp(App);
     const pinia = createPinia();