@harbour-enterprises/superdoc 1.8.0-next.1 → 1.8.0-next.2

package/dist/superdoc.umd.js

@@ -33250,8 +33250,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (exportedCommentDefs?.length === 0) return;
     if (commentsExportType === "clean") return;
     const commentNodeId = node2.attrs["w:id"];
+    const nodeIdStr = String(commentNodeId);
     const originalComment = comments.find((comment2) => {
-      return comment2.commentId == commentNodeId;
+      return String(comment2.commentId) === nodeIdStr || String(comment2.importedId) === nodeIdStr;
     });
     if (!originalComment) return;
     const parentCommentId = originalComment.parentCommentId;
@@ -35815,38 +35816,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       converter.documentOrigin = detectDocumentOrigin(docx);
       converter.commentThreadingProfile = detectCommentThreadingProfile(docx);
     }
-    if (converter?.telemetry) {
-      const files = Object.keys(docx).map((filePath) => {
-        const parts = filePath.split("/");
-        return {
-          filePath,
-          fileDepth: parts.length,
-          fileType: filePath.split(".").pop()
-        };
-      });
-      const trackStructure = (documentIdentifier = null) => converter.telemetry.trackFileStructure(
-        {
-          totalFiles: files.length,
-          maxDepth: Math.max(...files.map((f) => f.fileDepth)),
-          totalNodes: 0,
-          files
-        },
-        converter.fileSource,
-        converter.documentGuid ?? converter.documentId ?? null,
-        documentIdentifier ?? converter.documentId ?? null,
-        converter.documentInternalId
-      );
-      try {
-        const identifierResult = converter.getDocumentIdentifier?.();
-        if (identifierResult && typeof identifierResult.then === "function") {
-          identifierResult.then(trackStructure).catch(() => trackStructure());
-        } else {
-          trackStructure(identifierResult);
-        }
-      } catch {
-        trackStructure();
-      }
-    }
     const nodeListHandler = defaultNodeListHandler();
     const bodyNode = json.elements[0].elements.find((el) => el.name === "w:body");
     if (bodyNode) {
@@ -35889,12 +35858,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           ...bodySectPr ? { bodySectPr } : {}
         }
       };
-      if (result.content.length > 1) {
-        converter?.telemetry?.trackUsage("document_import", {
-          documentType: "docx",
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
-        });
-      }
       return {
         pmDoc: result,
         savedTagsToRestore: node2,
@@ -36017,16 +35980,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             );
             if (unhandled) {
               if (!context.elementName) continue;
-              converter?.telemetry?.trackStatistic("unknown", context);
               continue;
             } else {
-              converter?.telemetry?.trackStatistic("node", context);
-              if (context.type === "orderedList" || context.type === "bulletList") {
-                context.content.forEach((item) => {
-                  const innerItemContext = getSafeElementContext([item], 0, item, `/word/${filename || "document.xml"}`);
-                  converter?.telemetry?.trackStatistic("attributes", innerItemContext);
-                });
-              }
               const hasHighlightMark = nodes[0]?.marks?.find((mark2) => mark2.type === "highlight");
               if (hasHighlightMark) {
                 converter?.docHiglightColors.add(hasHighlightMark.attrs.color.toUpperCase());
@@ -36048,26 +36003,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           } catch (error) {
             console.debug("Import error", error);
             editor?.emit("exception", { error, editor });
-            converter?.telemetry?.trackStatistic("error", {
-              type: "processing_error",
-              message: error.message,
-              name: error.name,
-              stack: error.stack,
-              fileName: `/word/${filename || "document.xml"}`
-            });
           }
         }
         return processedElements;
       } catch (error) {
         console.debug("Error during import", error);
         editor?.emit("exception", { error, editor });
-        converter?.telemetry?.trackStatistic("error", {
-          type: "fatal_error",
-          message: error.message,
-          name: error.name,
-          stack: error.stack,
-          fileName: `/word/${filename || "document.xml"}`
-        });
         throw error;
       }
     };
@@ -38477,7 +38418,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       this.json = params2?.json;
       this.tagsNotInSchema = ["w:body"];
       this.savedTagsToRestore = [];
-      this.telemetry = params2?.telemetry || null;
       this.documentInternalId = null;
       this.fileSource = params2?.fileSource || null;
       this.documentId = params2?.documentId || null;
@@ -38770,7 +38710,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.8.0-next.1") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.8.0-next.2") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -38837,7 +38777,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return null;
     }
     /**
-     * Generate document hash for telemetry (async, lazy)
+     * Generate document hash (async, lazy)
      */
     async #generateDocumentHash() {
       if (!this.fileSource) return `HASH-${Date.now()}`;
@@ -51657,69 +51597,92 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       return comment2.parentCommentId;
     };
-    const startNodes = [];
-    const endNodes = [];
-    const seen = /* @__PURE__ */ new Set();
-    const trackedChangeCommentMeta = /* @__PURE__ */ new Map();
+    const commentRanges = /* @__PURE__ */ new Map();
+    const commentTrackedChangeId = /* @__PURE__ */ new Map();
     doc2.descendants((node2, pos) => {
       const commentMarks = node2.marks?.filter((mark2) => mark2.type.name === CommentMarkName) || [];
+      if (!commentMarks.length) return;
+      const nodeEnd = pos + node2.nodeSize;
+      const trackedChangeMark = node2.marks?.find((mark2) => TRACK_CHANGE_MARKS$1.includes(mark2.type.name));
+      const trackedChangeId = trackedChangeMark?.attrs?.id;
       commentMarks.forEach((commentMark) => {
         const { attrs = {} } = commentMark;
         const { commentId } = attrs;
         if (commentId === "pending") return;
-        if (seen.has(commentId)) return;
-        const comment2 = commentMap.get(commentId);
-        const parentCommentId = getThreadingParentId(comment2);
-        const trackedChangeMark = node2.marks?.find((mark2) => TRACK_CHANGE_MARKS$1.includes(mark2.type.name));
-        const trackedChangeId = trackedChangeMark?.attrs?.id;
-        const trackedSpan = trackedChangeId ? trackedChangeSpanById.get(trackedChangeId) : null;
-        if (trackedSpan) {
-          trackedChangeCommentMeta.set(commentId, {
-            comment: comment2,
-            parentCommentId,
-            trackedChangeId
+        if (!commentRanges.has(commentId)) {
+          commentRanges.set(commentId, {
+            start: pos,
+            end: nodeEnd,
+            attrs
           });
-          seen.add(commentId);
-          return;
+        } else {
+          const existing = commentRanges.get(commentId);
+          existing.start = Math.min(existing.start, pos);
+          existing.end = Math.max(existing.end, nodeEnd);
+        }
+        if (trackedChangeId && !commentTrackedChangeId.has(commentId)) {
+          commentTrackedChangeId.set(commentId, trackedChangeId);
         }
-        seen.add(commentId);
-        const commentStartNodeAttrs = getPreparedComment(commentMark.attrs);
-        const startNode = schema.nodes.commentRangeStart.create(commentStartNodeAttrs);
+      });
+    });
+    const startNodes = [];
+    const endNodes = [];
+    const seen = /* @__PURE__ */ new Set();
+    const trackedChangeCommentMeta = /* @__PURE__ */ new Map();
+    commentRanges.forEach(({ start: start2, end: end2, attrs }, commentId) => {
+      if (seen.has(commentId)) return;
+      seen.add(commentId);
+      const comment2 = commentMap.get(commentId);
+      const parentCommentId = getThreadingParentId(comment2);
+      const trackedChangeId = commentTrackedChangeId.get(commentId);
+      const trackedSpan = trackedChangeId ? trackedChangeSpanById.get(trackedChangeId) : null;
+      if (trackedSpan) {
+        trackedChangeCommentMeta.set(commentId, {
+          comment: comment2,
+          parentCommentId,
+          trackedChangeId
+        });
+        return;
+      }
+      const commentStartNodeAttrs = getPreparedComment(attrs);
+      const startNode = schema.nodes.commentRangeStart.create(commentStartNodeAttrs);
+      startNodes.push({
+        pos: start2,
+        node: startNode,
+        commentId,
+        parentCommentId
+      });
+      const endNode = schema.nodes.commentRangeEnd.create(commentStartNodeAttrs);
+      endNodes.push({
+        pos: end2,
+        node: endNode,
+        commentId,
+        parentCommentId
+      });
+      const childComments = comments.filter((c2) => getThreadingParentId(c2) === commentId).sort((a2, b2) => a2.createdTime - b2.createdTime);
+      childComments.forEach((c2) => {
+        if (seen.has(c2.commentId)) return;
+        seen.add(c2.commentId);
+        const childRange = commentRanges.get(c2.commentId);
+        const childStart = childRange?.start ?? start2;
+        const childEnd = childRange?.end ?? end2;
+        const childMark = getPreparedComment({
+          commentId: c2.commentId,
+          internal: c2.isInternal
+        });
+        const childStartNode = schema.nodes.commentRangeStart.create(childMark);
         startNodes.push({
-          pos,
-          node: startNode,
-          commentId,
-          parentCommentId
+          pos: childStart,
+          node: childStartNode,
+          commentId: c2.commentId,
+          parentCommentId: getThreadingParentId(c2)
         });
-        const endNode = schema.nodes.commentRangeEnd.create(commentStartNodeAttrs);
+        const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
         endNodes.push({
-          pos: pos + node2.nodeSize,
-          node: endNode,
-          commentId,
-          parentCommentId
-        });
-        const childComments = comments.filter((c2) => getThreadingParentId(c2) === commentId).sort((a2, b2) => a2.createdTime - b2.createdTime);
-        childComments.forEach((c2) => {
-          if (seen.has(c2.commentId)) return;
-          seen.add(c2.commentId);
-          const childMark = getPreparedComment({
-            commentId: c2.commentId,
-            internal: c2.isInternal
-          });
-          const childStartNode = schema.nodes.commentRangeStart.create(childMark);
-          startNodes.push({
-            pos,
-            node: childStartNode,
-            commentId: c2.commentId,
-            parentCommentId: getThreadingParentId(c2)
-          });
-          const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
-          endNodes.push({
-            pos: pos + node2.nodeSize,
-            node: childEndNode,
-            commentId: c2.commentId,
-            parentCommentId: getThreadingParentId(c2)
-          });
+          pos: childEnd,
+          node: childEndNode,
+          commentId: c2.commentId,
+          parentCommentId: getThreadingParentId(c2)
         });
       });
     });
@@ -51749,6 +51712,34 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           commentId: comment2.commentId,
           parentCommentId
         });
+        const childComments = comments.filter((c2) => getThreadingParentId(c2) === comment2.commentId).sort((a2, b2) => a2.createdTime - b2.createdTime);
+        childComments.forEach((c2) => {
+          if (seen.has(c2.commentId)) return;
+          seen.add(c2.commentId);
+          const childRange = commentRanges.get(c2.commentId);
+          const childStart = childRange?.start ?? span.startPos;
+          const childEnd = childRange?.end ?? span.endPos;
+          const childStartMarks = childRange ? void 0 : startMarks;
+          const childEndMarks = childRange ? void 0 : endMarks;
+          const childMarkAttrs = getPreparedComment({
+            commentId: c2.commentId,
+            internal: c2.isInternal
+          });
+          const childStartNode2 = schema.nodes.commentRangeStart.create(childMarkAttrs, null, childStartMarks);
+          startNodes.push({
+            pos: childStart,
+            node: childStartNode2,
+            commentId: c2.commentId,
+            parentCommentId: getThreadingParentId(c2)
+          });
+          const childEndNode2 = schema.nodes.commentRangeEnd.create(childMarkAttrs, null, childEndMarks);
+          endNodes.push({
+            pos: childEnd,
+            node: childEndNode2,
+            commentId: c2.commentId,
+            parentCommentId: getThreadingParentId(c2)
+          });
+        });
       });
       comments.filter((comment2) => trackedChangeSpanById.has(comment2.parentCommentId) && !comment2.trackedChange).sort((a2, b2) => a2.createdTime - b2.createdTime).forEach((comment2) => {
         if (seen.has(comment2.commentId)) return;
@@ -65061,7 +65052,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.8.0-next.1";
+  const summaryVersion = "1.8.0-next.2";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -65647,8 +65638,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         onFontsResolved: null,
         // async (file) => url;
         handleImageUpload: null,
-        // telemetry
-        telemetry: null,
         // Docx xml updated by User
         customUpdatedFiles: {},
         isHeaderFooterChanged: false,
@@ -66583,7 +66572,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           media: this.options.mediaFiles,
           fonts: this.options.fonts,
           debug: true,
-          telemetry: this.options.telemetry,
           fileSource: this.options.fileSource,
           documentId: this.options.documentId,
           mockWindow: this.options.mockWindow ?? null,
@@ -66832,7 +66820,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         handleClick: this.#handleNodeSelection.bind(this)
       });
       this.createNodeViews();
-      this.options.telemetry?.trackUsage?.("editor_initialized", {});
     }
     /**
      * Creates all node views.
@@ -67025,7 +67012,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       this.#dispatchTransaction(tr);
     }
     /**
-     * Get document identifier for telemetry (async - may generate hash)
+     * Get document identifier (async - may generate hash)
      */
     async getDocumentIdentifier() {
       return await this.converter?.getDocumentIdentifier() || null;
@@ -67042,17 +67029,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     isDocumentModified() {
       return this.converter?.documentModified || false;
     }
-    /**
-     * Get telemetry data (async because of lazy hash generation)
-     */
-    async getTelemetryData() {
-      return {
-        documentId: await this.getDocumentIdentifier(),
-        isModified: this.isDocumentModified(),
-        isPermanentId: !!this.converter?.documentGuid,
-        version: this.converter?.getSuperdocVersion()
-      };
-    }
     /**
      * @deprecated use getDocumentGuid instead
      */
@@ -67296,19 +67272,24 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       commentsType = "external",
       exportJsonOnly = false,
       exportXmlOnly = false,
-      comments = [],
+      comments,
       getUpdatedDocs = false,
       fieldsHighlightColor = null
     } = {}) {
       try {
-        const json = this.#prepareDocumentForExport(comments);
+        const effectiveComments = comments ?? this.converter.comments ?? [];
+        const preparedComments = effectiveComments.map((comment2) => ({
+          ...comment2,
+          commentJSON: comment2.commentJSON ?? comment2.textJson
+        }));
+        const json = this.#prepareDocumentForExport(preparedComments);
         const documentXml = await this.converter.exportToDocx(
           json,
           this.schema,
           this.storage.image.media,
           isFinalDoc,
           commentsType,
-          comments,
+          preparedComments,
           this,
           exportJsonOnly,
           fieldsHighlightColor
@@ -67354,7 +67335,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (footnotesRelsXml) {
           updatedDocs["word/_rels/footnotes.xml.rels"] = String(footnotesRelsXml);
         }
-        if (comments.length) {
+        if (preparedComments.length) {
           const commentsXml = this.converter.schemaToXml(this.converter.convertedXml["word/comments.xml"].elements[0]);
           updatedDocs["word/comments.xml"] = String(commentsXml);
           const commentsExtended = this.converter.convertedXml["word/commentsExtended.xml"];
@@ -67393,10 +67374,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           fonts: this.options.fonts,
           isHeadless: this.options.isHeadless
         });
-        this.options.telemetry?.trackUsage?.("document_export", {
-          documentType: "docx",
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
-        });
         return result;
       } catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
@@ -67733,7 +67710,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.8.0-next.1");
+      console.debug("[checkVersionMigrations] Current editor version", "1.8.0-next.2");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -73400,8 +73377,22 @@ ${o}
   const FIELD_ANNOTATION_STYLES = `
 /* Field annotation draggable styles */
 .superdoc-layout .annotation[data-draggable="true"] {
-  user-select: none;
-  -webkit-user-select: none;
+  user-select: text;
+}
+
+.superdoc-layout .annotation::selection,
+.superdoc-layout .annotation *::selection {
+  background: transparent;
+}
+  
+.superdoc-layout .annotation::-moz-selection,
+.superdoc-layout .annotation *::-moz-selection  {
+  background: transparent;
+}
+
+.superdoc-layout .annotation,
+.superdoc-layout .annotation * {
+  caret-color: transparent;
 }
 
 .superdoc-layout .annotation[data-draggable="true"]:hover {
@@ -104592,7 +104583,6 @@ ${o}
     #layoutErrorState = "healthy";
     #errorBanner = null;
     #errorBannerMessage = null;
-    #telemetryEmitter = null;
     #renderScheduled = false;
     #pendingDocChange = false;
     #pendingMapping = null;
@@ -104628,6 +104618,7 @@ ${o}
     #lastClickTime = 0;
     #lastClickPosition = { x: 0, y: 0 };
     #lastSelectedImageBlockId = null;
+    #lastSelectedFieldAnnotation = null;
     // Drag selection state
     #dragAnchor = null;
     #dragAnchorPageIndex = null;
@@ -105365,30 +105356,6 @@ ${o}
       this.on("layoutError", handler2);
       return () => this.off("layoutError", handler2);
     }
-    /**
-     * Attach a telemetry listener to capture layout events/errors.
-     * Uses type-safe discriminated union for event handling.
-     *
-     * @param handler - Callback function receiving telemetry events
-     * @returns Unsubscribe function to remove the handler
-     *
-     * @example
-     * ```typescript
-     * const unsubscribe = editor.onTelemetry((event) => {
-     *   if (event.type === 'remoteCursorsRender') {
-     *     console.log(`Rendered ${event.data.visibleCount} cursors in ${event.data.renderTimeMs}ms`);
-     *   }
-     * });
-     * ```
-     */
-    onTelemetry(handler2) {
-      this.#telemetryEmitter = handler2;
-      return () => {
-        if (this.#telemetryEmitter === handler2) {
-          this.#telemetryEmitter = null;
-        }
-      };
-    }
     /**
      * Surface pages for pagination UI consumers.
      */
@@ -107803,9 +107770,6 @@ ${o}
             this.emit("commentPositions", { positions: commentPositions });
           }
         }
-        if (this.#telemetryEmitter && metrics) {
-          this.#telemetryEmitter({ type: "layout", data: { layout, blocks: blocks2, measures, metrics } });
-        }
         this.#selectionSync.requestRender({ immediate: true });
         if (this.#remoteCursorManager?.hasRemoteCursors()) {
           this.#scheduleRemoteCursorReRender();
@@ -107904,6 +107868,45 @@ ${o}
     #scheduleSelectionUpdate(options) {
       this.#selectionSync.requestRender(options);
     }
+    #clearSelectedFieldAnnotationClass() {
+      if (this.#lastSelectedFieldAnnotation?.element?.classList?.contains("ProseMirror-selectednode")) {
+        this.#lastSelectedFieldAnnotation.element.classList.remove("ProseMirror-selectednode");
+      }
+      this.#lastSelectedFieldAnnotation = null;
+    }
+    #setSelectedFieldAnnotationClass(element2, pmStart) {
+      if (this.#lastSelectedFieldAnnotation?.element && this.#lastSelectedFieldAnnotation.element !== element2) {
+        this.#lastSelectedFieldAnnotation.element.classList.remove("ProseMirror-selectednode");
+      }
+      element2.classList.add("ProseMirror-selectednode");
+      this.#lastSelectedFieldAnnotation = { element: element2, pmStart };
+    }
+    #syncSelectedFieldAnnotationClass(selection) {
+      if (!selection || !(selection instanceof NodeSelection)) {
+        this.#clearSelectedFieldAnnotationClass();
+        return;
+      }
+      const node2 = selection.node;
+      if (!node2 || node2.type?.name !== "fieldAnnotation") {
+        this.#clearSelectedFieldAnnotationClass();
+        return;
+      }
+      if (!this.#painterHost) {
+        this.#clearSelectedFieldAnnotationClass();
+        return;
+      }
+      const pmStart = selection.from;
+      if (this.#lastSelectedFieldAnnotation?.pmStart === pmStart && this.#lastSelectedFieldAnnotation.element) {
+        return;
+      }
+      const selector = `.annotation[data-pm-start="${pmStart}"]`;
+      const element2 = this.#painterHost.querySelector(selector);
+      if (!element2) {
+        this.#clearSelectedFieldAnnotationClass();
+        return;
+      }
+      this.#setSelectedFieldAnnotationClass(element2, pmStart);
+    }
     /**
      * Updates the visual cursor/selection overlay to match the current editor selection.
      *
@@ -107933,6 +107936,7 @@ ${o}
     #updateSelection() {
       const sessionMode = this.#headerFooterSession?.session?.mode ?? "body";
       if (sessionMode !== "body") {
+        this.#clearSelectedFieldAnnotationClass();
         return;
       }
       if (!this.#localSelectionLayer) {
@@ -107940,6 +107944,7 @@ ${o}
       }
       if (this.#isViewLocked()) {
         try {
+          this.#clearSelectedFieldAnnotationClass();
           this.#localSelectionLayer.innerHTML = "";
         } catch (error) {
         }
@@ -107950,6 +107955,7 @@ ${o}
       const selection = editorState?.selection;
       if (!selection) {
         try {
+          this.#clearSelectedFieldAnnotationClass();
           this.#localSelectionLayer.innerHTML = "";
         } catch (error) {
         }
@@ -107963,6 +107969,7 @@ ${o}
       if (this.#layoutEpoch < docEpoch) {
         return;
       }
+      this.#syncSelectedFieldAnnotationClass(selection);
       this.#updateSelectionVirtualizationPins({ includeDragBuffer: this.#isDragging });
       if (selection instanceof CellSelection) {
         try {
@@ -107996,7 +108003,8 @@ ${o}
       }
       try {
         this.#localSelectionLayer.innerHTML = "";
-        if (domRects.length > 0) {
+        const isFieldAnnotationSelection = selection instanceof NodeSelection && selection.node?.type?.name === "fieldAnnotation";
+        if (domRects.length > 0 && !isFieldAnnotationSelection) {
           renderSelectionRects({
             localSelectionLayer: this.#localSelectionLayer,
             rects: domRects,
@@ -109502,9 +109510,6 @@ ${o}
         this.#layoutErrorState = this.#layoutState.layout ? "degraded" : "failed";
       }
       this.emit("layoutError", this.#layoutError);
-      if (this.#telemetryEmitter) {
-        this.#telemetryEmitter({ type: "error", data: this.#layoutError });
-      }
       this.#showLayoutErrorBanner(error);
     }
     #decorateError(error, stage) {
@@ -123868,7 +123873,14 @@ ${o}
           return commands2.rejectTrackedChangesBetween(from2, to);
         },
         insertTrackedChange: (options = {}) => ({ state, dispatch, editor }) => {
-          const { from: from2 = state.selection.from, to = state.selection.to, text: text2 = "", user, comment: comment2 } = options;
+          const {
+            from: from2 = state.selection.from,
+            to = state.selection.to,
+            text: text2 = "",
+            user,
+            comment: comment2,
+            addToHistory = true
+          } = options;
           const docSize = state.doc.content.size;
           if (from2 < 0 || to > docSize || from2 > to) {
             console.warn("insertTrackedChange: invalid range", { from: from2, to, docSize });
@@ -123940,6 +123952,9 @@ ${o}
           });
           tr.setMeta(CommentsPluginKey, { type: "force" });
           tr.setMeta("skipTrackChanges", true);
+          if (!addToHistory) {
+            tr.setMeta("addToHistory", false);
+          }
           dispatch(tr);
           if (comment2?.trim() && changeId && editor.commands.addCommentReply) {
             editor.commands.addCommentReply({
@@ -144765,6 +144780,12 @@ ${style2}
       const { command: command2 } = item;
       const isMarkToggle = this.isMarkToggle(item);
       const shouldRestoreFocus = Boolean(item?.restoreEditorFocus);
+      const hasArgument = argument !== null && argument !== void 0;
+      const isDropdownOpen = item?.type === "dropdown" && !hasArgument;
+      const isFontCommand = item?.command === "setFontFamily" || item?.command === "setFontSize";
+      if (isDropdownOpen && isFontCommand) {
+        return;
+      }
       if (!wasFocused && isMarkToggle) {
         this.pendingMarkCommands.push({ command: command2, argument, item });
         item?.activate?.();
@@ -148258,7 +148279,11 @@ ${style2}
         if (event.ctrlKey && isMacOS()) {
           return;
         }
-        if (event.target.classList.contains("ProseMirror")) return;
+        const target = event.target;
+        if (target?.classList?.contains("ProseMirror")) return;
+        if (target?.closest?.(".presentation-editor, .superdoc-layout")) {
+          return;
+        }
         onMarginClickCursorChange(event, activeEditor.value);
       };
       const handleMarginChange = ({ side, value }) => {
@@ -148423,7 +148448,7 @@ ${style2}
       };
     }
   });
-  const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-4160d1eb"]]);
+  const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-da20b5ef"]]);
   const _hoisted_1$h = ["innerHTML"];
   const _sfc_main$i = {
     __name: "SuperInput",
@@ -152781,9 +152806,6 @@ ${reason}`);
           doc2.setPresentationEditor(presentationEditor);
         }
         presentationEditor.setContextMenuDisabled?.(proxy.$superdoc.config.disableContextMenu);
-        presentationEditor.onTelemetry((telemetryPayload) => {
-          proxy.$superdoc.captureLayoutPipelineEvent(telemetryPayload);
-        });
         presentationEditor.on("commentPositions", ({ positions }) => {
           const commentsConfig = proxy.$superdoc.config.modules?.comments;
           if (!commentsConfig || commentsConfig === false) return;
@@ -152975,7 +152997,6 @@ ${reason}`);
           collaborationProvider: doc2.provider || null,
           isNewFile: doc2.isNewFile || false,
           handleImageUpload: proxy.$superdoc.config.handleImageUpload,
-          telemetry: proxy.$superdoc.telemetry,
           externalExtensions: proxy.$superdoc.config.editorExtensions || [],
           suppressDefaultDocxStyles: proxy.$superdoc.config.suppressDefaultDocxStyles,
           disableContextMenu: proxy.$superdoc.config.disableContextMenu,
@@ -153399,7 +153420,7 @@ ${reason}`);
       };
     }
   };
-  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-78737564"]]);
+  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-b35b3325"]]);
   const createSuperdocVueApp = () => {
     const app = createApp(App);
     const pinia = createPinia();
@@ -153516,8 +153537,6 @@ ${reason}`);
       // UI font for SuperDoc surfaces (toolbar, comments UI, etc.)
       uiDisplayFallbackFont: "Arial, Helvetica, sans-serif",
       isDev: false,
-      // telemetry config
-      telemetry: null,
       // Events
       onEditorBeforeCreate: () => null,
       onEditorCreate: () => null,
@@ -153596,7 +153615,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.8.0-next.1";
+      this.version = "1.8.0-next.2";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -154388,20 +154407,6 @@ ${reason}`);
       this.activeEditor.setHighContrastMode(isHighContrast);
       this.highContrastModeStore.setHighContrastMode(isHighContrast);
     }
-    /**
-     * Capture layout pipeline events from PresentationEditor
-     * Forwards metrics and errors to host callbacks
-     * @param {Object} payload - Event payload from PresentationEditor.onTelemetry
-     * @param {string} payload.type - Event type: 'layout' or 'error'
-     * @param {Object} payload.data - Event data (metrics for layout, error details for error)
-     * @returns {void}
-     */
-    captureLayoutPipelineEvent(payload) {
-      this.emit("layout-pipeline", payload);
-      if (typeof this.config.onLayoutPipelineEvent === "function") {
-        this.config.onLayoutPipelineEvent(payload);
-      }
-    }
   }
   function bail(error) {
     if (error) {