@dxos/react-ui-editor 0.6.2-next.5b5129c → 0.6.2

package/dist/lib/browser/index.mjs

@@ -1523,15 +1523,13 @@ var styles3 = EditorView7.baseTheme({
     backgroundColor: getToken("extend.colors.yellow.900")
   }
 });
-var createCommentMark = (id, isCurrent) => {
-  return Decoration4.mark({
-    class: isCurrent ? "cm-comment-current" : "cm-comment",
-    attributes: {
-      "data-testid": "cm-comment",
-      "data-comment-id": id
-    }
-  });
-};
+var createCommentMark = (id, isCurrent) => Decoration4.mark({
+  class: isCurrent ? "cm-comment-current" : "cm-comment",
+  attributes: {
+    "data-testid": "cm-comment",
+    "data-comment-id": id
+  }
+});
 var commentsDecorations = EditorView7.decorations.compute([
   commentsState
 ], (state2) => {
@@ -1541,7 +1539,7 @@ var commentsDecorations = EditorView7.decorations.compute([
     if (!range) {
       log4.warn("Invalid range:", range, {
         F: __dxlog_file6,
-        L: 160,
+        L: 159,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1843,20 +1841,26 @@ var scrollThreadIntoView = (view, id, center = true) => {
   }
   const range = Cursor.getRangeFromCursor(view.state, comment.comment.cursor);
   if (range) {
-    view.dispatch({
-      selection: {
-        anchor: range.from
-      },
-      effects: [
-        //
-        EditorView7.scrollIntoView(range.from, center ? {
-          y: "center"
-        } : void 0),
-        setSelection.of({
-          current: id
-        })
-      ]
-    });
+    const currentSelection = view.state.selection.main;
+    const currentScrollPosition = view.scrollDOM.scrollTop;
+    const targetScrollPosition = view.coordsAtPos(range.from)?.top;
+    const needsScroll = targetScrollPosition !== void 0 && (targetScrollPosition < currentScrollPosition || targetScrollPosition > currentScrollPosition + view.scrollDOM.clientHeight);
+    const needsSelectionUpdate = currentSelection.from !== range.from || currentSelection.to !== range.from;
+    if (needsScroll || needsSelectionUpdate) {
+      view.dispatch({
+        selection: needsSelectionUpdate ? {
+          anchor: range.from
+        } : void 0,
+        effects: [
+          needsScroll ? EditorView7.scrollIntoView(range.from, center ? {
+            y: "center"
+          } : void 0) : [],
+          needsSelectionUpdate ? setSelection.of({
+            current: id
+          }) : []
+        ].flat()
+      });
+    }
   }
 };
 var selectionOverlapsComment = (state2) => {