@harbour-enterprises/superdoc 0.34.9 → 0.35.2

package/dist/superdoc.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const superEditor_es = require("./chunks/super-editor.es-Cs1TKdep.cjs");
-const superdoc = require("./chunks/index-myYbO6wO.cjs");
+const superEditor_es = require("./chunks/super-editor.es-CyHF2Y6u.cjs");
+const superdoc = require("./chunks/index-2Tp2kFsl.cjs");
 const blankDocx = require("./chunks/blank-docx-DfW3Eeh2.cjs");
 exports.AnnotatorHelpers = superEditor_es.AnnotatorHelpers;
 exports.Editor = superEditor_es.Editor;

package/dist/superdoc.es.js

@@ -1,5 +1,5 @@
-import { a, E, b, S, d, i, j, n, r, p, q } from "./chunks/super-editor.es-C8J_Vybd.es.js";
-import { D, H, P, S as S2, m, l } from "./chunks/index-tHw-DC34.es.js";
+import { a, E, b, S, d, i, j, n, r, p, q } from "./chunks/super-editor.es-DgptwjrT.es.js";
+import { D, H, P, S as S2, m, l } from "./chunks/index-cSTBvMaB.es.js";
 import { B } from "./chunks/blank-docx-ABm6XYAA.es.js";
 export {
   a as AnnotatorHelpers,

package/dist/superdoc.umd.js

@@ -33140,7 +33140,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const trackedDeletedText = attributes["custom:trackedDeletedText"] !== "null" ? attributes["custom:trackedDeletedText"] : null;
       const date = new Date(createdDate);
       const unixTimestampMs = date.getTime();
-      const parsedComment = nodeListHandler.handler({
+      const parsedElements = nodeListHandler.handler({
         nodes: el.elements,
         nodeListHandler,
         docx,
@@ -33148,7 +33148,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         converter,
         path: [el]
       });
-      const { attrs } = parsedComment[0];
+      const { attrs } = parsedElements[0];
       const paraId = attrs["w14:paraId"];
       return {
         commentId: internalId || v4$1(),
@@ -33156,7 +33156,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         creatorName: authorName,
         creatorEmail: authorEmail,
         createdTime: unixTimestampMs,
-        textJson: parsedComment[0],
+        textJson: parsedElements[0],
+        elements: parsedElements,
         initials,
         paraId,
         trackedChange,
@@ -33178,7 +33179,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const { elements = [] } = initialElements[0] ?? {};
     const commentEx = elements.filter((el) => el.name === "w15:commentEx");
     return comments.map((comment2) => {
-      const extendedDef = commentEx.find((ce2) => ce2.attributes["w15:paraId"] === comment2.paraId);
+      const extendedDef = commentEx.find((ce2) => {
+        const isIncludedInCommentElements = comment2.elements.some(
+          (el) => el.attrs["w14:paraId"] === ce2.attributes["w15:paraId"]
+        );
+        return isIncludedInCommentElements;
+      });
       if (!extendedDef) return { ...comment2, isDone: comment2.isDone ?? false };
       const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
       let parentComment;
@@ -35798,7 +35804,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.34.9") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.35.2") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -55698,6 +55704,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const selectAll = () => ({ state: state2, dispatch }) => selectAll$1(state2, dispatch);
   const deleteSelection = () => ({ state: state2, tr, dispatch }) => {
     const { from: from2, to, empty: empty2 } = state2.selection;
+    if (document && document.getSelection) {
+      const currentDomSelection = document.getSelection();
+      if (currentDomSelection?.baseNode?.data?.length == 1) {
+        return false;
+      }
+    }
     if (empty2) {
       return deleteSelection$1(state2, dispatch);
     }
@@ -57268,12 +57280,41 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const Editable = Extension.create({
     name: "editable",
     addPmPlugins() {
+      const editor = this.editor;
       const editablePlugin = new Plugin({
         key: new PluginKey("editable"),
         props: {
-          editable: () => {
-            return this.editor.options.editable;
-          }
+          editable: () => editor.options.editable,
+          handleDOMEvents: {
+            beforeinput: (_view, event) => {
+              if (!editor.options.editable) {
+                event.preventDefault();
+                return true;
+              }
+              return false;
+            },
+            mousedown: (_view, event) => {
+              if (!editor.options.editable) {
+                event.preventDefault();
+                return true;
+              }
+              return false;
+            },
+            focus: (view, event) => {
+              if (!editor.options.editable) {
+                event.preventDefault();
+                view.dom.blur();
+                return true;
+              }
+              return false;
+            }
+          },
+          handleClick: () => !editor.options.editable,
+          handleDoubleClick: () => !editor.options.editable,
+          handleTripleClick: () => !editor.options.editable,
+          handleKeyDown: () => !editor.options.editable,
+          handlePaste: () => !editor.options.editable,
+          handleDrop: () => !editor.options.editable
         }
       });
       return [editablePlugin];
@@ -58284,12 +58325,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         importedId: node2.attrs["w:id"]
       });
       if (type2.name === "commentRangeStart") {
-        toMark.push({
-          commentId: resolvedCommentId,
-          importedId,
-          internal,
-          start: pos
-        });
+        if (!matchingImportedComment.isDone) {
+          toMark.push({
+            commentId: resolvedCommentId,
+            importedId,
+            internal,
+            start: pos
+          });
+        }
         ensureFallbackComment({
           converter,
           matchingImportedComment,
@@ -61848,7 +61891,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexCHtB4uAl),
+        Promise.resolve().then(() => indexCzChRmiA),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -61958,7 +62001,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         Object.entries(this.converter.convertedXml).forEach(([name, json2]) => {
           if (name.includes("header") || name.includes("footer")) {
             const resultXml = this.converter.schemaToXml(json2.elements[0]);
-            updatedHeadersFooters[name] = String(resultXml);
+            updatedHeadersFooters[name] = String(resultXml.replace(/\[\[sdspace\]\]/g, ""));
           }
         });
         const numberingData = this.converter.convertedXml["word/numbering.xml"];
@@ -62066,7 +62109,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * @returns {Object | void} Migration results
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.34.9");
+      console.debug("[checkVersionMigrations] Current editor version", "0.35.2");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -79855,11 +79898,11 @@ ${l}
           break;
         }
         const [left2, right2] = direction < 0 ? [neighbor, currentChange] : [currentChange, neighbor];
-        if (!areDirectlyConnected(left2, right2)) {
-          break;
-        }
         const sharesId = neighbor.mark.attrs.id === matchingId;
         const complementary = isComplementaryPair(currentChange.mark.type.name, neighbor.mark.type.name);
+        if (!sharesId && !areDirectlyConnected(left2, right2)) {
+          break;
+        }
         if (!sharesId && !complementary) {
           break;
         }
@@ -100932,11 +100975,29 @@ ${style2}
           delete props.options.content;
           const ydoc = props.options.ydoc;
           const provider2 = props.options.collaborationProvider;
-          const handleSynced = () => {
-            pollForMetaMapData(ydoc);
-            provider2.off("synced", handleSynced);
+          const waitForSync = () => {
+            if (provider2.isSynced || provider2.synced) return Promise.resolve();
+            return new Promise((resolve2) => {
+              const onSync = (synced) => {
+                if (synced === false) return;
+                provider2.off("synced", onSync);
+                provider2.off("sync", onSync);
+                resolve2();
+              };
+              provider2.on("synced", onSync);
+              provider2.on("sync", onSync);
+            });
           };
-          provider2.on("synced", handleSynced);
+          waitForSync().then(async () => {
+            const metaMap = ydoc.getMap("meta");
+            if (metaMap.has("docx")) {
+              pollForMetaMapData(ydoc);
+            } else {
+              props.options.isNewFile = true;
+              const fileData = await loadNewFileData();
+              if (fileData) initEditor(fileData);
+            }
+          });
         }
       };
       const getExtensions = () => {
@@ -101120,7 +101181,7 @@ ${style2}
       };
     }
   };
-  const SuperEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$1$1, [["__scopeId", "data-v-cd3558fe"]]);
+  const SuperEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$1$1, [["__scopeId", "data-v-86fdd359"]]);
   const _hoisted_1$h = ["innerHTML"];
   const _sfc_main$i = {
     __name: "SuperInput",
@@ -103633,6 +103694,9 @@ ${reason}`);
     context.emit("awareness-update", payload);
   }
   function createProvider({ config: config2, user, documentId, socket, superdocInstance }) {
+    console.warn(
+      "[superdoc] Internal provider creation is deprecated. Pass { ydoc, provider } to modules.collaboration instead."
+    );
     if (!config2.providerType) config2.providerType = "superdoc";
     const providers = {
       hocuspocus: () => createHocuspocusProvider({ config: config2, user, documentId, socket, superdocInstance }),
@@ -103689,6 +103753,22 @@ ${reason}`);
   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: comment2 } = event;
     const yComment = new Y.Map(Object.entries(comment2));
@@ -104047,8 +104127,8 @@ ${reason}`);
     const getEditor = () => editorRef.value;
     function initDocumentType({ type: type3, data: data2 }) {
       if (data2?.type) return data2.type;
-      if (type3) return type3 in documentTypes ? documentTypes[type3] : null;
-      throw new Error("Document type not specified for doc:", params2);
+      if (type3) return documentTypes[type3] || type3;
+      throw new Error("Document type not specified");
     }
     const removeComments = () => {
       conversationsBackup.value = conversations.value;
@@ -118535,7 +118615,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.34.9";
+      this.version = "0.35.2";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -118696,6 +118776,28 @@ ${style2}
     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: v4(),
+              type: DOCX,
+              name: "document.docx"
+            }
+          ];
+        }
+        this.config.documents.forEach((doc2) => {
+          doc2.ydoc = externalYdoc;
+          doc2.provider = externalProvider;
+          doc2.role = this.config.role;
+        });
+        initCollaborationComments(this);
+        return this.config.documents;
+      }
       if (collaborationModuleConfig.providerType === "hocuspocus") {
         this.config.socket = new provider.HocuspocusProviderWebsocket({
           url: collaborationModuleConfig.url
@@ -120935,7 +121037,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexCHtB4uAl = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexCzChRmiA = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));