@harbour-enterprises/superdoc 0.23.0-next.10 → 0.23.0-next.12

package/dist/superdoc.umd.js

@@ -29137,6 +29137,13 @@
       if (node.nodeType !== window.Node.ELEMENT_NODE) return;
       [...node.attributes].forEach((attr) => {
         const name = attr.name.toLowerCase();
+        if (name === "style") {
+          const cleanedStyle = cleanStyle(attr.value);
+          if (!cleanedStyle) {
+            node.removeAttribute(attr.name);
+          } else node.setAttribute(attr.name, cleanedStyle);
+          return;
+        }
         const shouldKeep = SUPPORTED_ATTRS.includes(name) || name.startsWith("data-");
         if (!shouldKeep) {
           node.removeAttribute(attr.name);
@@ -29147,6 +29154,12 @@
     cleanNode(doc2.body);
     return doc2.body.innerHTML;
   }
+  function cleanStyle(style2) {
+    if (!style2) return "";
+    const declarations = style2.split(";").map((s) => s.trim()).filter(Boolean);
+    const textAlign = declarations.find((d2) => d2.startsWith("text-align"));
+    return textAlign ? `${textAlign};` : "";
+  }
   function createDocFromHTML(content, schema, options = {}) {
     const { isImport = false } = options;
     let parsedContent;
@@ -56442,26 +56455,100 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const setEditorToolbar = ({ editor }, mainEditor) => {
     editor.setToolbar(mainEditor.toolbar);
   };
+  const normalizeCommentEventPayload = ({ conversation, editorOptions, fallbackCommentId, fallbackInternal }) => {
+    const { user, documentId } = editorOptions || {};
+    const normalized = {
+      ...conversation,
+      commentId: conversation?.commentId ?? fallbackCommentId,
+      isInternal: conversation?.isInternal ?? fallbackInternal
+    };
+    if (!normalized.commentText && normalized.text) {
+      normalized.commentText = normalized.text;
+      delete normalized.text;
+    }
+    if ("skipEmit" in normalized) delete normalized.skipEmit;
+    if (!normalized.creatorName && user?.name) {
+      normalized.creatorName = user.name;
+    }
+    if (!normalized.creatorEmail && user?.email) {
+      normalized.creatorEmail = user.email;
+    }
+    if (!normalized.createdTime) {
+      normalized.createdTime = Date.now();
+    }
+    if (!normalized.fileId && documentId) {
+      normalized.fileId = documentId;
+    }
+    if (!normalized.documentId && documentId) {
+      normalized.documentId = documentId;
+    }
+    return normalized;
+  };
+  const updatePosition = ({ allCommentPositions, threadId, pos, currentBounds, node }) => {
+    let bounds = {};
+    if (currentBounds instanceof DOMRect) {
+      bounds = {
+        top: currentBounds.top,
+        bottom: currentBounds.bottom,
+        left: currentBounds.left,
+        right: currentBounds.right
+      };
+    } else {
+      bounds = { ...currentBounds };
+    }
+    if (!allCommentPositions[threadId]) {
+      allCommentPositions[threadId] = {
+        threadId,
+        start: pos,
+        end: pos + node.nodeSize,
+        bounds
+      };
+    } else {
+      const existing = allCommentPositions[threadId];
+      existing.start = Math.min(existing.start, pos);
+      existing.end = Math.max(existing.end, pos + node.nodeSize);
+      existing.bounds.top = Math.min(existing.bounds.top, currentBounds.top);
+      existing.bounds.bottom = Math.max(existing.bounds.bottom, currentBounds.bottom);
+    }
+  };
   const TRACK_CHANGE_MARKS = [TrackInsertMarkName, TrackDeleteMarkName, TrackFormatMarkName];
   const CommentsPluginKey = new PluginKey("comments");
   const CommentsPlugin = Extension.create({
     name: "comments",
     addCommands() {
       return {
-        insertComment: (conversation) => ({ tr, dispatch }) => {
+        insertComment: (conversation = {}) => ({ tr, dispatch }) => {
           const { selection } = tr;
           const { $from, $to } = selection;
-          const { commentId, isInternal } = conversation;
+          const skipEmit = conversation?.skipEmit;
+          const resolvedCommentId = conversation?.commentId ?? v4$1();
+          const resolvedInternal = conversation?.isInternal ?? false;
           tr.setMeta(CommentsPluginKey, { event: "add" });
           tr.addMark(
             $from.pos,
             $to.pos,
             this.editor.schema.marks[CommentMarkName].create({
-              commentId,
-              internal: isInternal
+              commentId: resolvedCommentId,
+              internal: resolvedInternal
             })
           );
-          dispatch(tr);
+          if (dispatch) dispatch(tr);
+          const shouldEmit = !skipEmit && resolvedCommentId !== "pending";
+          if (shouldEmit) {
+            const commentPayload = normalizeCommentEventPayload({
+              conversation,
+              editorOptions: this.editor.options,
+              fallbackCommentId: resolvedCommentId,
+              fallbackInternal: resolvedInternal
+            });
+            const activeCommentId = commentPayload.commentId || commentPayload.importedId || null;
+            const event = {
+              type: comments_module_events$1.ADD,
+              comment: commentPayload,
+              ...activeCommentId && { activeCommentId }
+            };
+            this.editor.emit("commentsUpdate", event);
+          }
           return true;
         },
         removeComment: ({ commentId, importedId }) => ({ tr, dispatch, state: state2 }) => {
@@ -56697,33 +56784,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return [commentsPlugin];
     }
   });
-  const updatePosition = ({ allCommentPositions, threadId, pos, currentBounds, node }) => {
-    let bounds = {};
-    if (currentBounds instanceof DOMRect) {
-      bounds = {
-        top: currentBounds.top,
-        bottom: currentBounds.bottom,
-        left: currentBounds.left,
-        right: currentBounds.right
-      };
-    } else {
-      bounds = { ...currentBounds };
-    }
-    if (!allCommentPositions[threadId]) {
-      allCommentPositions[threadId] = {
-        threadId,
-        start: pos,
-        end: pos + node.nodeSize,
-        bounds
-      };
-    } else {
-      const existing = allCommentPositions[threadId];
-      existing.start = Math.min(existing.start, pos);
-      existing.end = Math.max(existing.end, pos + node.nodeSize);
-      existing.bounds.top = Math.min(existing.bounds.top, currentBounds.top);
-      existing.bounds.bottom = Math.max(existing.bounds.bottom, currentBounds.bottom);
-    }
-  };
   const getActiveCommentId = (doc2, selection) => {
     if (!selection) return;
     const { $from, $to } = selection;
@@ -97886,7 +97946,11 @@ ${reason}`);
       pendingComment.value = getPendingComment({ selection, documentId: selection.documentId, parentCommentId: null });
       if (!superdoc2.config.isInternal) pendingComment.value.isInternal = false;
       if (superdoc2.activeEditor?.commands) {
-        superdoc2.activeEditor.commands.insertComment({ ...pendingComment.value.getValues(), commentId: "pending" });
+        superdoc2.activeEditor.commands.insertComment({
+          ...pendingComment.value.getValues(),
+          commentId: "pending",
+          skipEmit: true
+        });
       }
       if (pendingComment.value.selection.source === "super-editor" && superdocStore.selectionPosition) {
         superdocStore.selectionPosition.source = "super-editor";
@@ -97958,7 +98022,7 @@ ${reason}`);
       superdocStore.selectionPosition = null;
       superdoc2.activeEditor?.commands.removeComment({ commentId: "pending" });
     };
-    const addComment = ({ superdoc: superdoc2, comment }) => {
+    const addComment = ({ superdoc: superdoc2, comment, skipEditorUpdate = false }) => {
       let parentComment = commentsList.value.find((c2) => c2.commentId === activeComment.value);
       if (!parentComment) parentComment = comment;
       const newComment = useComment(comment.getValues());
@@ -97972,8 +98036,8 @@ ${reason}`);
       if (!superdoc2.config.isInternal) newComment.isInternal = false;
       commentsList.value.push(newComment);
       removePendingComment(superdoc2);
-      if (!comment.trackedChange && superdoc2.activeEditor?.commands && !comment.parentCommentId) {
-        superdoc2.activeEditor.commands.insertComment(newComment.getValues());
+      if (!skipEditorUpdate && !comment.trackedChange && superdoc2.activeEditor?.commands && !comment.parentCommentId) {
+        superdoc2.activeEditor.commands.insertComment({ ...newComment.getValues(), skipEmit: true });
       }
       const event = { type: COMMENT_EVENTS.ADD, comment: newComment.getValues() };
       syncCommentsToClients(superdoc2, event);
@@ -111171,7 +111235,14 @@ ${style2}
         hasInitializedLocations,
         isCommentHighlighted
       } = storeToRefs(commentsStore);
-      const { showAddComment, handleEditorLocationsUpdate, handleTrackedChangeUpdate } = commentsStore;
+      const {
+        showAddComment,
+        handleEditorLocationsUpdate,
+        handleTrackedChangeUpdate,
+        addComment,
+        getComment,
+        COMMENT_EVENTS
+      } = commentsStore;
       const { proxy } = getCurrentInstance();
       commentsStore.proxy = proxy;
       const { isHighContrastMode: isHighContrastMode2 } = useHighContrastMode();
@@ -111363,7 +111434,33 @@ ${style2}
         handleEditorLocationsUpdate(allCommentPositions, activeThreadId);
       };
       const onEditorCommentsUpdate = (params2 = {}) => {
-        const { activeCommentId, type: type2 } = params2;
+        let { activeCommentId, type: type2, comment: commentPayload } = params2;
+        if (COMMENT_EVENTS?.ADD && type2 === COMMENT_EVENTS.ADD && commentPayload) {
+          if (!commentPayload.commentText && commentPayload.text) {
+            commentPayload.commentText = commentPayload.text;
+          }
+          const currentUser = proxy.$superdoc?.user;
+          if (currentUser) {
+            if (!commentPayload.creatorName) commentPayload.creatorName = currentUser.name;
+            if (!commentPayload.creatorEmail) commentPayload.creatorEmail = currentUser.email;
+          }
+          if (!commentPayload.createdTime) commentPayload.createdTime = Date.now();
+          const primaryDocumentId = commentPayload.documentId || documents.value?.[0]?.id;
+          if (!commentPayload.documentId && primaryDocumentId) {
+            commentPayload.documentId = primaryDocumentId;
+          }
+          if (!commentPayload.fileId && primaryDocumentId) {
+            commentPayload.fileId = primaryDocumentId;
+          }
+          const id = commentPayload.commentId || commentPayload.importedId;
+          if (id && !getComment(id)) {
+            const commentModel = useComment(commentPayload);
+            addComment({ superdoc: proxy.$superdoc, comment: commentModel, skipEditorUpdate: true });
+          }
+          if (!activeCommentId && id) {
+            activeCommentId = id;
+          }
+        }
         if (type2 === "trackedChange") {
           handleTrackedChangeUpdate({ superdoc: proxy.$superdoc, params: params2 });
         }
@@ -111696,7 +111793,7 @@ ${style2}
       };
     }
   };
-  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-45f44b6e"]]);
+  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-96983cf9"]]);
   const createSuperdocVueApp = () => {
     const app = createApp(App);
     const pinia = createPinia();