fix: Duplicate comment menus

vriteio · May 27, 2024 · 991c2b3 · 991c2b3
1 parent 34b8ad4
commit 991c2b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/apps/web/src/lib/editor/extensions/comment-menu/component.tsx b/apps/web/src/lib/editor/extensions/comment-menu/component.tsx
@@ -50,7 +50,11 @@ const CommentMenu: Component<BlockActionMenuProps> = (props) => {
         };
 
         if (existingFragmentIndex >= 0) {
-          newFragments.push(Object.assign(fragments()[existingFragmentIndex], newFragment));
+          newFragments.splice(
+            existingFragmentIndex,
+            1,
+            Object.assign(fragments()[existingFragmentIndex], newFragment)
+          );
         } else {
           newFragments.push(newFragment);
         }

diff --git a/apps/web/src/lib/editor/extensions/element/node.tsx b/apps/web/src/lib/editor/extensions/element/node.tsx
@@ -182,7 +182,11 @@ const Element = BaseElement.extend<
           ) {
             const isAtEnd = newState.selection.$from.pos === newState.doc.nodeSize - 3;
 
-            if (isAtEnd && !oldState.selection.eq(newState.selection)) {
+            if (
+              isAtEnd &&
+              !(oldState.selection instanceof TextSelection) &&
+              !oldState.selection.eq(newState.selection)
+            ) {
               return newState.tr.setSelection(
                 Selection.near(
                   newState.tr.doc.resolve(