@harbour-enterprises/superdoc 1.0.0-beta.8 → 1.0.0

package/dist/chunks/{index-DMwWcmrk.cjs → index-CVDEHD5c.cjs}

@@ -1,11 +1,11 @@
 "use strict";
-const superEditor_es = require("./super-editor.es-Bo_fWMy6.cjs");
+const superEditor_es = require("./super-editor.es-CWr0w1Tk.cjs");
 const blankDocx = require("./blank-docx-DfW3Eeh2.cjs");
-const eventemitter3 = require("./eventemitter3-CFCpOk3d.cjs");
+const eventemitter3 = require("./eventemitter3-DQmQUge-.cjs");
 const provider = require("@hocuspocus/provider");
-const vue = require("./vue-ARQSyfaw.cjs");
+const vue = require("./vue-jWLMl8Ts.cjs");
 const Y = require("yjs");
-const jszip = require("./jszip-B99MTu59.cjs");
+const jszip = require("./jszip-BdEez1WM.cjs");
 const uuid = require("./uuid-R7L08bOx.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -3252,6 +3252,9 @@ function awarenessHandler(context, { changes = {}, states }) {
   context.emit("awareness-update", payload);
 }
 function createProvider({ config, user, documentId, socket, superdocInstance }) {
+  console.warn(
+    "[superdoc] Internal provider creation is deprecated. Pass { ydoc, provider } to modules.collaboration instead."
+  );
   if (!config.providerType) config.providerType = "superdoc";
   const providers = {
     hocuspocus: () => createHocuspocusProvider({ config, user, documentId, socket, superdocInstance }),
@@ -3308,6 +3311,22 @@ const onDisconnect = (superdocInstance, documentId) => {
 const onDestroy = (superdocInstance, documentId) => {
   console.warn("🔌 [superdoc] Destroyed", documentId);
 };
+function setupAwarenessHandler(provider2, superdocInstance, user) {
+  const awareness = provider2.awareness;
+  if (!awareness) {
+    console.warn("[superdoc] External provider missing awareness property");
+    return;
+  }
+  if (user && awareness.setLocalStateField) {
+    awareness.setLocalStateField("user", user);
+  }
+  awareness.on("change", (changes = {}) => {
+    awarenessHandler(superdocInstance, {
+      changes,
+      states: awareness.getStates()
+    });
+  });
+}
 const addYComment = (yArray, ydoc, event) => {
   const { comment } = event;
   const yComment = new Y.Map(Object.entries(comment));
@@ -3482,6 +3501,7 @@ function useComment(params2) {
   const creatorImage = params2.creatorImage;
   const createdTime = params2.createdTime || Date.now();
   const importedAuthor = vue.ref(params2.importedAuthor || null);
+  const docxCommentJSON = params2.docxCommentJSON || null;
   const commentText = vue.ref(params2.commentText || "");
   const selection = params2.selection ? useSelection(params2.selection) : useSelection({
     documentId: fileId,
@@ -3596,6 +3616,7 @@ function useComment(params2) {
       creatorImage,
       createdTime,
       importedAuthor: importedAuthor.value,
+      docxCommentJSON,
       isInternal: isInternal.value,
       commentText: commentText.value,
       selection: selection ? selection.getValues() : null,
@@ -3634,6 +3655,7 @@ function useComment(params2) {
     resolvedByEmail,
     resolvedByName,
     importedAuthor,
+    docxCommentJSON,
     // Actions
     setText,
     getValues,
@@ -3669,8 +3691,8 @@ function useDocument(params2, superdocConfig) {
   const getPresentationEditor = () => presentationEditorRef.value;
   function initDocumentType({ type: type2, data: data2 }) {
     if (data2?.type) return data2.type;
-    if (type2) return type2 in documentTypes ? documentTypes[type2] : null;
-    throw new Error("Document type not specified for doc:", params2);
+    if (type2) return documentTypes[type2] || type2;
+    throw new Error("Document type not specified");
   }
   const removeComments = () => {
     conversationsBackup.value = conversations.value;
@@ -4215,6 +4237,7 @@ const useCommentsStore = /* @__PURE__ */ defineStore("comments", () => {
       const newComment = useComment({
         fileId: documentId,
         fileType: document2.type,
+        docxCommentJSON: comment.textJson,
         commentId: comment.commentId,
         isInternal: false,
         parentCommentId: comment.parentCommentId,
@@ -4275,7 +4298,7 @@ const useCommentsStore = /* @__PURE__ */ defineStore("comments", () => {
     commentsList.value.forEach((comment) => {
       const values = comment.getValues();
       const richText = values.commentText;
-      const schema = convertHtmlToSchema(richText);
+      const schema = values.docxCommentJSON || convertHtmlToSchema(richText);
       processedComments.push({
         ...values,
         commentJSON: schema
@@ -16462,26 +16485,14 @@ const _sfc_main$9 = {
     const firstGroupRendered = vue.ref(false);
     const verticalOffset = vue.ref(0);
     const commentsRenderKey = vue.ref(0);
+    const measurementTimeoutId = vue.ref(null);
     const getCommentPosition = vue.computed(() => (comment) => {
       if (!floatingCommentsContainer.value) return { top: "0px" };
-      floatingCommentsContainer.value.getBoundingClientRect();
       if (typeof comment.top !== "number" || isNaN(comment.top)) {
         return { display: "none" };
       }
       return { top: `${comment.top}px` };
     });
-    const findScrollParent = (element) => {
-      if (!element) return window;
-      let parent = element.parentNode;
-      while (parent && parent !== document) {
-        const style2 = getComputedStyle(parent);
-        if (/(auto|scroll|overlay)/.test(style2.overflow + style2.overflowY + style2.overflowX)) {
-          return parent;
-        }
-        parent = parent.parentNode;
-      }
-      return window;
-    };
     const handleDialog = (dialog) => {
       if (!dialog) return;
       const { elementRef, commentId } = dialog;
@@ -16489,44 +16500,68 @@ const _sfc_main$9 = {
       vue.nextTick(() => {
         const id = commentId;
         if (renderedSizes.value.some((item) => item.id == id)) return;
-        const editorBounds = props.parent.getBoundingClientRect();
         const comment = getFloatingComments.value.find((c2) => c2.commentId === id || c2.importedId == id);
         const positionKey = id || comment?.importedId;
-        let position = editorCommentPositions.value[positionKey]?.bounds || {};
+        const positionEntry = editorCommentPositions.value[positionKey];
+        const position = positionEntry?.bounds || {};
         if (props.currentDocument.type === "application/pdf") {
           Object.entries(comment.selection?.selectionBounds).forEach(([key, value]) => {
             position[key] = Number(value);
           });
-          position.top += editorBounds.top;
         }
         if (!position) return;
-        const scrollParent = findScrollParent(props.parent);
-        scrollParent === window ? window.scrollY : scrollParent.scrollTop;
         const bounds = elementRef.value?.getBoundingClientRect();
+        const top = Number(position.top);
+        if (!Number.isFinite(top)) return;
         const placement = {
           id,
-          top: position.top - editorBounds.top,
+          top,
           height: bounds.height,
           commentRef: comment,
-          elementRef
+          elementRef,
+          pageIndex: positionEntry?.pageIndex ?? 0
         };
         renderedSizes.value.push(placement);
       });
     };
     const processLocations = async () => {
-      let currentBottom = 0;
-      renderedSizes.value.sort((a, b) => a.top - b.top).forEach((comment) => {
-        if (comment.top <= currentBottom + 15) {
-          comment.top = currentBottom + 15;
-        }
-        currentBottom = comment.top + comment.height;
+      const groupedByPage = renderedSizes.value.reduce((acc, comment) => {
+        const key = comment.pageIndex ?? 0;
+        if (!acc[key]) acc[key] = [];
+        acc[key].push(comment);
+        return acc;
+      }, {});
+      Object.values(groupedByPage).forEach((comments) => {
+        comments.sort((a, b) => a.top - b.top).forEach((comment, idx, arr) => {
+          if (idx === 0) return;
+          const prev = arr[idx - 1];
+          const minTop = prev.top + prev.height + 15;
+          if (comment.top < minTop) {
+            comment.top = minTop;
+          }
+        });
       });
       await vue.nextTick();
       firstGroupRendered.value = true;
     };
     vue.watchEffect(() => {
-      if (renderedSizes.value.length === getFloatingComments.value.length) {
+      if (measurementTimeoutId.value) {
+        clearTimeout(measurementTimeoutId.value);
+        measurementTimeoutId.value = null;
+      }
+      const totalComments = getFloatingComments.value.length;
+      const measuredComments = renderedSizes.value.length;
+      if (totalComments === 0) {
+        return;
+      }
+      if (measuredComments === totalComments) {
         vue.nextTick(processLocations);
+      } else if (measuredComments > 0 && !firstGroupRendered.value) {
+        measurementTimeoutId.value = setTimeout(() => {
+          if (!firstGroupRendered.value && renderedSizes.value.length > 0) {
+            processLocations();
+          }
+        }, 100);
       }
     });
     vue.watch(activeComment, (newVal, oldVal) => {
@@ -16549,6 +16584,12 @@ const _sfc_main$9 = {
         }, 200);
       });
     });
+    vue.onBeforeUnmount(() => {
+      if (measurementTimeoutId.value) {
+        clearTimeout(measurementTimeoutId.value);
+        measurementTimeoutId.value = null;
+      }
+    });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", {
         class: "section-wrapper",
@@ -16599,7 +16640,7 @@ const _sfc_main$9 = {
     };
   }
 };
-const FloatingComments = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-91de2350"]]);
+const FloatingComments = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-eab6fbfa"]]);
 const _sfc_main$8 = {
   __name: "TextField",
   props: {
@@ -17227,7 +17268,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-DJ7BWUbW.cjs")));
+    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-C3_5zd7y.cjs")));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -17354,6 +17395,13 @@ const _sfc_main = {
       presentationEditor.onTelemetry((telemetryPayload) => {
         proxy.$superdoc.captureLayoutPipelineEvent(telemetryPayload);
       });
+      presentationEditor.on("commentPositions", ({ positions }) => {
+        const commentsConfig = proxy.$superdoc.config.modules?.comments;
+        if (!commentsConfig || commentsConfig === false) return;
+        if (!positions || Object.keys(positions).length === 0) return;
+        const mappedPositions = presentationEditor.getCommentBounds(positions, layers.value);
+        handleEditorLocationsUpdate(mappedPositions);
+      });
     };
     const onEditorDestroy = () => {
       proxy.$superdoc.broadcastEditorDestroy();
@@ -17900,7 +17948,7 @@ const _sfc_main = {
     };
   }
 };
-const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3fafc837"]]);
+const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3c3356b6"]]);
 const createSuperdocVueApp = () => {
   const app = vue.createApp(App);
   const pinia = createPinia();
@@ -18080,7 +18128,7 @@ class SuperDoc extends eventemitter3.EventEmitter {
     this.config.colors = shuffleArray(this.config.colors);
     this.userColorMap = /* @__PURE__ */ new Map();
     this.colorIndex = 0;
-    this.version = "1.0.0-beta.8";
+    this.version = "1.0.0";
     this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
     this.superdocId = config.superdocId || uuid.v4();
     this.colors = this.config.colors;
@@ -18241,6 +18289,28 @@ class SuperDoc extends eventemitter3.EventEmitter {
   async #initCollaboration({ collaboration: collaborationModuleConfig, comments: commentsConfig = {} } = {}) {
     if (!collaborationModuleConfig) return this.config.documents;
     this.isCollaborative = true;
+    const { ydoc: externalYdoc, provider: externalProvider } = collaborationModuleConfig;
+    if (externalYdoc && externalProvider) {
+      this.ydoc = externalYdoc;
+      this.provider = externalProvider;
+      setupAwarenessHandler(externalProvider, this, this.config.user);
+      if (!this.config.documents || this.config.documents.length === 0) {
+        this.config.documents = [
+          {
+            id: uuid.v4(),
+            type: DOCX,
+            name: "document.docx"
+          }
+        ];
+      }
+      this.config.documents.forEach((doc) => {
+        doc.ydoc = externalYdoc;
+        doc.provider = externalProvider;
+        doc.role = this.config.role;
+      });
+      initCollaborationComments(this);
+      return this.config.documents;
+    }
     if (collaborationModuleConfig.providerType === "hocuspocus") {
       this.config.socket = new provider.HocuspocusProviderWebsocket({
         url: collaborationModuleConfig.url
@@ -18428,7 +18498,6 @@ class SuperDoc extends eventemitter3.EventEmitter {
    */
   addCommentsList(element) {
     if (!this.config?.modules?.comments || this.config.role === "viewer") return;
-    this.#log("🦋 [superdoc] Adding comments list to:", element);
     if (element) this.config.modules.comments.element = element;
     this.commentsList = new SuperComments(this.config.modules?.comments, this);
     if (this.config.onCommentsListChange) this.config.onCommentsListChange({ isRendered: true });
@@ -18491,7 +18560,9 @@ class SuperDoc extends eventemitter3.EventEmitter {
       editing: () => this.#setModeEditing(),
       suggesting: () => this.#setModeSuggesting()
     };
-    if (types[type]) types[type]();
+    if (types[type]) {
+      types[type]();
+    }
   }
   /**
    * Set the document mode on a document's editor (PresentationEditor or Editor).
@@ -18563,7 +18634,7 @@ class SuperDoc extends eventemitter3.EventEmitter {
   }
   #setModeViewing() {
     this.toolbar.activeEditor = null;
-    this.setTrackedChangesPreferences({ mode: "final", enabled: false });
+    this.setTrackedChangesPreferences({ mode: "original", enabled: false });
     this.superdocStore.documents.forEach((doc) => {
       doc.removeComments();
       this.#applyDocumentMode(doc, "viewing");

package/dist/chunks/{jszip-BwsONqK5.es.js → jszip-5vvIqAEE.es.js}

@@ -1,4 +1,4 @@
-import "./vue-CztqUvm1.es.js";
+import "./vue-Dysv_7z5.es.js";
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }

package/dist/chunks/{jszip-B99MTu59.cjs → jszip-BdEez1WM.cjs}

@@ -1,5 +1,5 @@
 "use strict";
-require("./vue-ARQSyfaw.cjs");
+require("./vue-jWLMl8Ts.cjs");
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }