fix(bubble-menu): fix debounce not working with collab/collaboration …

…cursor (#3956)
ueberdosis · Apr 12, 2023 · e8cef04 · e8cef04
1 parent cf175a3
commit e8cef04
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -57,5 +57,8 @@
     "vue-2",
     "vue-3"
   ],
-  "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+  "[typescript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  }
 }
diff --git a/demos/package.json b/demos/package.json
@@ -18,7 +18,7 @@
     "shiki": "^0.10.0",
     "simplify-js": "^1.2.4",
     "y-prosemirror": "1.0.20",
-    "y-webrtc": "^10.2.3",
+    "y-webrtc": "^10.2.5",
     "yjs": "^13.5.39"
   },
   "devDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/extension-bubble-menu/src/bubble-menu-plugin.ts b/packages/extension-bubble-menu/src/bubble-menu-plugin.ts
@@ -164,23 +164,34 @@ export class BubbleMenuView {
       return
     }
 
-    this.updateHandler(view, oldState)
+    const selectionChanged = !oldState?.selection.eq(view.state.selection)
+    const docChanged = !oldState?.doc.eq(view.state.doc)
+
+    this.updateHandler(view, selectionChanged, docChanged, oldState)
   }
 
   handleDebouncedUpdate = (view: EditorView, oldState?: EditorState) => {
+    const selectionChanged = !oldState?.selection.eq(view.state.selection)
+    const docChanged = !oldState?.doc.eq(view.state.doc)
+
+    if (!selectionChanged && !docChanged) {
+      return
+    }
+
     if (this.updateDebounceTimer) {
       clearTimeout(this.updateDebounceTimer)
     }
 
     this.updateDebounceTimer = window.setTimeout(() => {
-      this.updateHandler(view, oldState)
+      this.updateHandler(view, selectionChanged, docChanged, oldState)
     }, this.updateDelay)
   }
 
-  updateHandler = (view: EditorView, oldState?: EditorState) => {
+  updateHandler = (view: EditorView, selectionChanged: boolean, docChanged: boolean, oldState?: EditorState) => {
     const { state, composing } = view
-    const { doc, selection } = state
-    const isSame = oldState && oldState.doc.eq(doc) && oldState.selection.eq(selection)
+    const { selection } = state
+
+    const isSame = !selectionChanged && !docChanged
 
     if (composing || isSame) {
       return