Merge pull request #423 from Harbour-Enterprises/nick/har-9366-floating-changes-flicker

HAR-9366 - Fix issue with floating comments ignoring tracked changes when no comments

Author: edoversb

packages/super-editor/src/core/helpers/getActiveFormatting.js

@@ -68,7 +68,6 @@ function getActiveAttributes(state) {
     else state.doc.nodesBetween(from, to, (node) => getAttrs(node));
     return attributes;
   } catch (error) {
-    console.debug('Error getting active attributes:', error);
     return {};
   }
 }

packages/super-editor/src/extensions/comment/comments-plugin.js

@@ -183,12 +183,14 @@ export const CommentsPlugin = Extension.create({
 
               shouldUpdate = true;
               editor.emit('commentsUpdate', update);
+
+              const { tr: newTr } = editor.view.state;
+              const { dispatch } = editor.view;
+              newTr.setMeta(CommentsPluginKey, { type: 'force' });
+              dispatch(newTr);
             };
           };
 
-          const { allCommentPositions } = pluginState;
-          editor.emit('comment-positions', { activeThreadId, allCommentPositions });
-
           return pluginState
         },
       },
@@ -207,7 +209,7 @@ export const CommentsPlugin = Extension.create({
           update(view, prevState) {
             const { state } = view
             const { doc, tr } = state
-  
+
             if (prevDoc && prevDoc.eq(doc) && !shouldUpdate) return;
             prevDoc = doc;
             shouldUpdate = false;
@@ -280,6 +282,7 @@ export const CommentsPlugin = Extension.create({
 
             // Remember the new decorations for next time
             prevDecorations = decorationSet
+
           },
         }
       },

packages/superdoc/src/components/CommentsLayer/FloatingComments.vue

@@ -118,7 +118,7 @@ const resetLayout = async () => {
   verticalOffset.value = 0;
 };
 
-watch(activeComment, () => {
+watch(activeComment, (newVal, oldVal) => {
   nextTick(() => {
     if (!activeComment.value) return verticalOffset.value = 0;
 
@@ -130,10 +130,9 @@ watch(activeComment, () => {
 
     const selectionTop = comment.selection.selectionBounds.top;
     const renderedTop = renderedItem.top;
-    const scrollY = window.scrollY;
 
     const editorBounds = floatingCommentsContainer.value.getBoundingClientRect();
-    verticalOffset.value = selectionTop - renderedTop - editorBounds.top + scrollY;
+    verticalOffset.value = selectionTop - renderedTop;
 
     setTimeout(() => {
       renderedItem.elementRef.value?.scrollIntoView({

packages/superdoc/src/stores/comments-store.js

@@ -513,6 +513,8 @@ export const useCommentsStore = defineStore('comments', () => {
       .filter((c) => !c.resolvedTime)
       .filter((c) => {
         const keys = Object.keys(editorCommentPositions.value);
+        console.debug('[getFloatingComments] editorCommentPositions', keys)
+
         return keys.includes(c.commentId);
       });
     return comments;