docx-diff-editor 1.0.10 → 1.0.14

package/dist/index.js

@@ -733,10 +733,9 @@ var DocxDiffEditor = react.forwardRef(
         hiddenContainer.style.cssText = "position:absolute;top:-9999px;left:-9999px;width:800px;height:600px;visibility:hidden;pointer-events:none;";
         document.body.appendChild(hiddenContainer);
         return new Promise((resolve, reject) => {
+          let resolved = false;
           let tempSuperdoc = null;
-          let timeoutId;
           const cleanup = () => {
-            clearTimeout(timeoutId);
             try {
               tempSuperdoc?.destroy?.();
             } catch {
@@ -750,40 +749,43 @@ var DocxDiffEditor = react.forwardRef(
               documentMode: "editing",
               rulers: false,
               user: { name: "Converter", email: "converter@local" },
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
               onReady: async ({ superdoc: sd }) => {
+                if (resolved) return;
                 try {
                   const json = sd?.activeEditor?.getJSON() || { type: "doc", content: [] };
-                  if (!sd?.activeEditor?.exportDocx) {
-                    cleanup();
-                    reject(new Error("exportDocx method not available"));
-                    return;
-                  }
-                  const blob = await sd.activeEditor.exportDocx({ isFinalDoc: false });
+                  const blob = await sd?.activeEditor?.exportDocx({ isFinalDoc: true });
                   if (!blob) {
-                    cleanup();
-                    reject(new Error("Export returned no data"));
-                    return;
+                    throw new Error("Export returned no data");
                   }
+                  resolved = true;
                   cleanup();
                   resolve({ blob, json });
                 } catch (err) {
+                  resolved = true;
                   cleanup();
                   reject(err);
                 }
               },
               onException: ({ error: err }) => {
+                if (resolved) return;
+                resolved = true;
                 cleanup();
                 reject(err);
               }
             });
-            timeoutId = setTimeout(() => {
-              cleanup();
-              reject(new Error("HTML to DOCX conversion timed out"));
+            setTimeout(() => {
+              if (!resolved) {
+                resolved = true;
+                cleanup();
+                reject(new Error("HTML to DOCX conversion timed out"));
+              }
             }, TIMEOUTS.PARSE_TIMEOUT);
           } catch (err) {
-            cleanup();
-            reject(err);
+            if (!resolved) {
+              resolved = true;
+              cleanup();
+              reject(err);
+            }
           }
         });
       },
@@ -806,31 +808,18 @@ var DocxDiffEditor = react.forwardRef(
         if (toolbarRef.current) {
           toolbarRef.current.id = toolbarId;
         }
-        let documentFile;
-        if (options.document) {
-          if (options.document instanceof File) {
-            documentFile = options.document;
-          } else {
-            documentFile = new File([options.document], "document.docx", {
-              type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-            });
-          }
-        }
         return new Promise((resolve, reject) => {
           let resolved = false;
           try {
             const superdoc = new SuperDocRef.current({
               selector: `#${editorId}`,
               toolbar: showToolbar ? `#${toolbarId}` : void 0,
-              document: documentFile,
-              html: options.html,
+              document: options.document,
               documentMode: "editing",
               role: "editor",
               rulers: showRulers,
               user: DEFAULT_SUPERDOC_USER,
               permissionResolver,
-              // Enable comments module for track changes sidebar
-              modules: { comments: {} },
               onReady: ({ superdoc: sd }) => {
                 if (resolved) return;
                 resolved = true;
@@ -911,9 +900,9 @@ var DocxDiffEditor = react.forwardRef(
             onSourceLoaded?.(initialSource);
           }
         } else {
-          const finalJson = extractedJson || json;
-          setSourceJson(finalJson);
-          onSourceLoaded?.(finalJson);
+          const sourceJsonToUse = extractedJson || json;
+          setSourceJson(sourceJsonToUse);
+          onSourceLoaded?.(sourceJsonToUse);
         }
         setIsLoading(false);
         onReady?.();
@@ -950,9 +939,8 @@ var DocxDiffEditor = react.forwardRef(
         /**
          * Set the source/base document.
          * 
-         * For HTML content, we convert to DOCX first using a hidden SuperDoc instance.
-         * This is critical because SuperDoc's track change infrastructure (including
-         * track bubbles) is only properly initialized when loading from a DOCX file.
+         * IMPORTANT: For HTML content, we convert to DOCX first using a hidden
+         * SuperDoc instance. This is required for track bubbles to work properly.
          */
         async setSource(content) {
           if (!SuperDocRef.current) {
@@ -968,15 +956,9 @@ var DocxDiffEditor = react.forwardRef(
               const result = await createSuperdoc({ document: content });
               json = result.json;
             } else if (contentType === "html") {
-              const { blob, json: extractedJson } = await convertHtmlToDocxBlob(content);
+              const { blob, json: htmlJson } = await convertHtmlToDocxBlob(content);
               const result = await createSuperdoc({ document: blob });
-              json = extractedJson;
-              if (result.superdoc?.activeEditor) {
-                const editorJson = result.superdoc.activeEditor.getJSON();
-                if (!extractedJson.content || extractedJson.content.length === 0) {
-                  json = editorJson;
-                }
-              }
+              json = htmlJson;
             } else {
               const result = await createSuperdoc(templateDocx ? { document: templateDocx } : {});
               if (result.superdoc?.activeEditor && isProseMirrorJSON(content)) {
@@ -1073,6 +1055,22 @@ var DocxDiffEditor = react.forwardRef(
             if (superdocRef.current?.activeEditor) {
               setEditorContent(superdocRef.current.activeEditor, merged);
               enableReviewMode(superdocRef.current);
+              const sd = superdocRef.current;
+              if (sd.commentsStore?.processLoadedDocxComments) {
+                setTimeout(() => {
+                  try {
+                    sd.commentsStore.processLoadedDocxComments({
+                      superdoc: sd,
+                      editor: sd.activeEditor,
+                      comments: [],
+                      // Empty array - we just want to trigger createCommentForTrackChanges
+                      documentId: sd.activeEditor?.options?.documentId || "primary"
+                    });
+                  } catch (err) {
+                    console.warn("[DocxDiffEditor] Failed to process track changes for bubbles:", err);
+                  }
+                }, 50);
+              }
             }
             const insertions = diff.segments.filter((s) => s.type === "insert").length;
             const deletions = diff.segments.filter((s) => s.type === "delete").length;