Merge pull request #698 from Harbour-Enterprises/nick/update-ydoc-generate-collab-data

fix: update ydoc when generating collaborative data

Author: harbournick

packages/super-editor/src/core/Editor.js

@@ -597,10 +597,10 @@ export class Editor extends EventEmitter {
 
   /**
    * Export the yjs binary from the current state.
-   * @returns {Uint8Array} The exported yjs binary
+   * @returns {Promise<Uint8Array>} The exported yjs binary
    */
-  generateCollaborationUpdate() {
-    return generateCollaborationData(this);
+  async generateCollaborationUpdate() {
+    return await generateCollaborationData(this);
   }
 
   /**

packages/super-editor/src/extensions/collaboration/collaboration-helpers.js

@@ -4,10 +4,11 @@
  * @param {Editor} editor The editor instance
  * @returns {Promise<void>}
  */
-export const updateYdocDocxData = async (editor) => {
-  if (!editor.options.ydoc) return;
+export const updateYdocDocxData = async (editor, ydoc) => {
+  ydoc = ydoc || editor.options.ydoc;
+  if (!ydoc) return;
 
-  const metaMap = editor.options.ydoc.getMap('meta');
+  const metaMap = ydoc.getMap('meta');
   const docx = [...metaMap.get('docx')];
   const newXml = await editor.exportDocx({ getUpdatedDocs: true });
 
@@ -22,7 +23,7 @@ export const updateYdocDocxData = async (editor) => {
     });
   });
 
-  editor.options.ydoc.transact(
+  ydoc.transact(
     () => {
       metaMap.set('docx', docx);
     },

packages/super-editor/src/extensions/collaboration/collaboration.js

@@ -186,8 +186,9 @@ const initSyncListener = (ydoc, editor, extension) => {
   provider.on('synced', emit);
 };
 
-export const generateCollaborationData = (editor) => {
+export const generateCollaborationData = async (editor) => {
   const ydoc = prosemirrorToYDoc(editor.state.doc, 'supereditor');
   initializeMetaMap(ydoc, editor);
+  await updateYdocDocxData(editor, ydoc);
   return encodeStateAsUpdate(ydoc);
 };