@harbour-enterprises/superdoc 0.34.9 → 0.35.2

package/dist/chunks/{PdfViewer-C2rB3UFf.es.js → PdfViewer-BFtgOHmf.es.js}

@@ -1,5 +1,5 @@
 import { m as defineComponent, y as h, O as Transition, $ as process$1, J as watchEffect, a as computed, r as ref, j as onMounted, W as onUnmounted, b as createElementBlock, o as openBlock, f as createBaseVNode, e as createCommentVNode, v as createVNode, x as unref } from "./vue-CKmzTNVs.es.js";
-import { d as derived, c, a as cB, f as fadeInTransition, b as cM, N as NBaseLoading, w as warnOnce, u as useConfig, e as useTheme, p as pxfy, g as createKey, h as useThemeClass, i as useCompitable, _ as _export_sfc, j as useSuperdocStore, s as storeToRefs, k as useSelection } from "./index-tHw-DC34.es.js";
+import { d as derived, c, a as cB, f as fadeInTransition, b as cM, N as NBaseLoading, w as warnOnce, u as useConfig, e as useTheme, p as pxfy, g as createKey, h as useThemeClass, i as useCompitable, _ as _export_sfc, j as useSuperdocStore, s as storeToRefs, k as useSelection } from "./index-cSTBvMaB.es.js";
 function self(vars) {
   const {
     opacityDisabled,

package/dist/chunks/{PdfViewer-DE24U_pv.cjs → PdfViewer-CjZkPY58.cjs}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("./vue-Cwv-wUpm.cjs");
-const superdoc = require("./index-myYbO6wO.cjs");
+const superdoc = require("./index-2Tp2kFsl.cjs");
 function self(vars) {
   const {
     opacityDisabled,

package/dist/chunks/{index-myYbO6wO.cjs → index-2Tp2kFsl.cjs}

@@ -1,5 +1,5 @@
 "use strict";
-const superEditor_es = require("./super-editor.es-Cs1TKdep.cjs");
+const superEditor_es = require("./super-editor.es-CyHF2Y6u.cjs");
 const blankDocx = require("./blank-docx-DfW3Eeh2.cjs");
 const eventemitter3 = require("./eventemitter3-DmHNHvFX.cjs");
 const provider = require("@hocuspocus/provider");
@@ -3249,6 +3249,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 }),
@@ -3305,6 +3308,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));
@@ -3663,8 +3682,8 @@ function useDocument(params2, superdocConfig) {
   const getEditor = () => editorRef.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;
@@ -17219,7 +17238,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-DE24U_pv.cjs")));
+    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-CjZkPY58.cjs")));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -17983,7 +18002,7 @@ class SuperDoc extends eventemitter3.EventEmitter {
     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 = config.superdocId || uuid.v4();
     this.colors = this.config.colors;
@@ -18144,6 +18163,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

package/dist/chunks/{index-CHtB4uAl-BS8u99OE.es.js → index-CzChRmiA-C73DMMSu.es.js}

@@ -1,4 +1,4 @@
-import { s as getDefaultExportFromCjs$2 } from "./super-editor.es-C8J_Vybd.es.js";
+import { s as getDefaultExportFromCjs$2 } from "./super-editor.es-DgptwjrT.es.js";
 import { V as VFile } from "./index-CvBqQJbG-CvBqQJbG.es.js";
 function bail(error) {
   if (error) {

package/dist/chunks/{index-CHtB4uAl-D-zQo-Zr.cjs → index-CzChRmiA-Db3kkVxc.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const superEditor_es = require("./super-editor.es-Cs1TKdep.cjs");
+const superEditor_es = require("./super-editor.es-CyHF2Y6u.cjs");
 const indexCvBqQJbG = require("./index-CvBqQJbG-Dwm0THD7.cjs");
 function bail(error) {
   if (error) {

package/dist/chunks/{index-tHw-DC34.es.js → index-cSTBvMaB.es.js}

@@ -1,4 +1,4 @@
-import { q as index, C as CommentsPluginKey, h as TrackChangesBasePluginKey, E as Editor, n as getRichTextExtensions, f as SuperInput, e as SuperEditor, A as AIWriter, g as SuperToolbar, i as createZip } from "./super-editor.es-C8J_Vybd.es.js";
+import { q as index, C as CommentsPluginKey, h as TrackChangesBasePluginKey, E as Editor, n as getRichTextExtensions, f as SuperInput, e as SuperEditor, A as AIWriter, g as SuperToolbar, i as createZip } from "./super-editor.es-DgptwjrT.es.js";
 import { B as BlankDOCX } from "./blank-docx-ABm6XYAA.es.js";
 import { E as EventEmitter } from "./eventemitter3-hYlnBzSA.es.js";
 import { HocuspocusProvider, HocuspocusProviderWebsocket } from "@hocuspocus/provider";
@@ -3232,6 +3232,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 }),
@@ -3288,6 +3291,22 @@ const onDisconnect = (superdocInstance, documentId) => {
 const onDestroy = (superdocInstance, documentId) => {
   console.warn("🔌 [superdoc] Destroyed", documentId);
 };
+function setupAwarenessHandler(provider, superdocInstance, user) {
+  const awareness = provider.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 Map$2(Object.entries(comment));
@@ -3646,8 +3665,8 @@ function useDocument(params2, superdocConfig) {
   const getEditor = () => editorRef.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;
@@ -17202,7 +17221,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = defineAsyncComponent(() => import("./PdfViewer-C2rB3UFf.es.js"));
+    const PdfViewer = defineAsyncComponent(() => import("./PdfViewer-BFtgOHmf.es.js"));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -17966,7 +17985,7 @@ class SuperDoc extends EventEmitter {
     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 = config.superdocId || v4();
     this.colors = this.config.colors;
@@ -18127,6 +18146,28 @@ class SuperDoc extends 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: 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 HocuspocusProviderWebsocket({
         url: collaborationModuleConfig.url

package/dist/chunks/{super-editor.es-Cs1TKdep.cjs → super-editor.es-CyHF2Y6u.cjs}

@@ -33139,7 +33139,7 @@ function importCommentData({ docx, editor, converter }) {
     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,
@@ -33147,7 +33147,7 @@ function importCommentData({ docx, editor, converter }) {
       converter,
       path: [el]
     });
-    const { attrs } = parsedComment[0];
+    const { attrs } = parsedElements[0];
     const paraId = attrs["w14:paraId"];
     return {
       commentId: internalId || v4(),
@@ -33155,7 +33155,8 @@ function importCommentData({ docx, editor, converter }) {
       creatorName: authorName,
       creatorEmail: authorEmail,
       createdTime: unixTimestampMs,
-      textJson: parsedComment[0],
+      textJson: parsedElements[0],
+      elements: parsedElements,
       initials,
       paraId,
       trackedChange,
@@ -33177,7 +33178,12 @@ const generateCommentsWithExtendedData = ({ docx, comments }) => {
   const { elements = [] } = initialElements[0] ?? {};
   const commentEx = elements.filter((el) => el.name === "w15:commentEx");
   return comments.map((comment) => {
-    const extendedDef = commentEx.find((ce2) => ce2.attributes["w15:paraId"] === comment.paraId);
+    const extendedDef = commentEx.find((ce2) => {
+      const isIncludedInCommentElements = comment.elements.some(
+        (el) => el.attrs["w14:paraId"] === ce2.attributes["w15:paraId"]
+      );
+      return isIncludedInCommentElements;
+    });
     if (!extendedDef) return { ...comment, isDone: comment.isDone ?? false };
     const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
     let parentComment;
@@ -35797,7 +35803,7 @@ const _SuperConverter = class _SuperConverter2 {
   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);
   }
   /**
@@ -47956,6 +47962,12 @@ const toggleNode = (typeOrName, toggleTypeOrName, attrs = {}) => ({ state: state
 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);
   }
@@ -49526,12 +49538,41 @@ const Keymap = Extension.create({
 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];
@@ -50542,12 +50583,14 @@ const prepareCommentsForImport = (doc2, tr, schema, converter) => {
       importedId: node.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,
@@ -54106,7 +54149,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-CHtB4uAl-D-zQo-Zr.cjs")),
+      Promise.resolve().then(() => require("./index-CzChRmiA-Db3kkVxc.cjs")),
       Promise.resolve().then(() => require("./index-DRCvimau-H4Ck3S9a.cjs")),
       Promise.resolve().then(() => require("./index-C_x_N6Uh-Db3CUJMX.cjs")),
       Promise.resolve().then(() => require("./index-D_sWOSiG-BtDZzJ6I.cjs")),
@@ -54216,7 +54259,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       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"];
@@ -54324,7 +54367,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @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");
@@ -72113,11 +72156,11 @@ const getChangesByIdToResolve = (state2, id) => {
         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;
       }
@@ -93217,11 +93260,29 @@ const _sfc_main$1 = {
         delete props.options.content;
         const ydoc = props.options.ydoc;
         const provider = props.options.collaborationProvider;
-        const handleSynced = () => {
-          pollForMetaMapData(ydoc);
-          provider.off("synced", handleSynced);
+        const waitForSync = () => {
+          if (provider.isSynced || provider.synced) return Promise.resolve();
+          return new Promise((resolve) => {
+            const onSync = (synced) => {
+              if (synced === false) return;
+              provider.off("synced", onSync);
+              provider.off("sync", onSync);
+              resolve();
+            };
+            provider.on("synced", onSync);
+            provider.on("sync", onSync);
+          });
         };
-        provider.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 = () => {
@@ -93405,7 +93466,7 @@ const _sfc_main$1 = {
     };
   }
 };
-const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-cd3558fe"]]);
+const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-86fdd359"]]);
 const _hoisted_1 = ["innerHTML"];
 const _sfc_main = {
   __name: "SuperInput",

package/dist/chunks/{super-editor.es-C8J_Vybd.es.js → super-editor.es-DgptwjrT.es.js}

@@ -33122,7 +33122,7 @@ function importCommentData({ docx, editor, converter }) {
     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,
@@ -33130,7 +33130,7 @@ function importCommentData({ docx, editor, converter }) {
       converter,
       path: [el]
     });
-    const { attrs } = parsedComment[0];
+    const { attrs } = parsedElements[0];
     const paraId = attrs["w14:paraId"];
     return {
       commentId: internalId || v4(),
@@ -33138,7 +33138,8 @@ function importCommentData({ docx, editor, converter }) {
       creatorName: authorName,
       creatorEmail: authorEmail,
       createdTime: unixTimestampMs,
-      textJson: parsedComment[0],
+      textJson: parsedElements[0],
+      elements: parsedElements,
       initials,
       paraId,
       trackedChange,
@@ -33160,7 +33161,12 @@ const generateCommentsWithExtendedData = ({ docx, comments }) => {
   const { elements = [] } = initialElements[0] ?? {};
   const commentEx = elements.filter((el) => el.name === "w15:commentEx");
   return comments.map((comment) => {
-    const extendedDef = commentEx.find((ce2) => ce2.attributes["w15:paraId"] === comment.paraId);
+    const extendedDef = commentEx.find((ce2) => {
+      const isIncludedInCommentElements = comment.elements.some(
+        (el) => el.attrs["w14:paraId"] === ce2.attributes["w15:paraId"]
+      );
+      return isIncludedInCommentElements;
+    });
     if (!extendedDef) return { ...comment, isDone: comment.isDone ?? false };
     const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
     let parentComment;
@@ -35780,7 +35786,7 @@ const _SuperConverter = class _SuperConverter2 {
   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);
   }
   /**
@@ -47939,6 +47945,12 @@ const toggleNode = (typeOrName, toggleTypeOrName, attrs = {}) => ({ state: state
 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);
   }
@@ -49509,12 +49521,41 @@ const Keymap = Extension.create({
 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];
@@ -50525,12 +50566,14 @@ const prepareCommentsForImport = (doc2, tr, schema, converter) => {
       importedId: node.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,
@@ -54089,7 +54132,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      import("./index-CHtB4uAl-BS8u99OE.es.js"),
+      import("./index-CzChRmiA-C73DMMSu.es.js"),
       import("./index-DRCvimau-Cw339678.es.js"),
       import("./index-C_x_N6Uh-DJn8hIEt.es.js"),
       import("./index-D_sWOSiG-DE96TaT5.es.js"),
@@ -54199,7 +54242,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       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"];
@@ -54307,7 +54350,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @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");
@@ -72096,11 +72139,11 @@ const getChangesByIdToResolve = (state2, id) => {
         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;
       }
@@ -93200,11 +93243,29 @@ const _sfc_main$1 = {
         delete props.options.content;
         const ydoc = props.options.ydoc;
         const provider = props.options.collaborationProvider;
-        const handleSynced = () => {
-          pollForMetaMapData(ydoc);
-          provider.off("synced", handleSynced);
+        const waitForSync = () => {
+          if (provider.isSynced || provider.synced) return Promise.resolve();
+          return new Promise((resolve) => {
+            const onSync = (synced) => {
+              if (synced === false) return;
+              provider.off("synced", onSync);
+              provider.off("sync", onSync);
+              resolve();
+            };
+            provider.on("synced", onSync);
+            provider.on("sync", onSync);
+          });
         };
-        provider.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 = () => {
@@ -93388,7 +93449,7 @@ const _sfc_main$1 = {
     };
   }
 };
-const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-cd3558fe"]]);
+const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-86fdd359"]]);
 const _hoisted_1 = ["innerHTML"];
 const _sfc_main = {
   __name: "SuperInput",

package/dist/packages/superdoc/src/composables/use-document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-document.d.ts","sourceRoot":"","sources":["../../../../../src/composables/use-document.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4GC"}
+{"version":3,"file":"use-document.d.ts","sourceRoot":"","sources":["../../../../../src/composables/use-document.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6GC"}