@iamakulov/codemirror-view 6.39.10 → 6.39.11

package/dist/index.cjs

@@ -4377,7 +4377,8 @@ class InputState {
             firefoxCopyCutHack(view.contentDOM.ownerDocument);
     }
     handleEvent(event) {
-        if (!eventBelongsToEditor(this.view, event) || this.ignoreDuringComposition(event))
+        if (!eventBelongsToEditor(this.view, event) || this.ignoreDuringComposition(event) ||
+            this.ignoreDuringTransientFocus(event))
             return;
         if (event.type == "keydown" && this.keydown(event))
             return;
@@ -4481,6 +4482,22 @@ class InputState {
         }
         return false;
     }
+    ignoreDuringTransientFocus(event) {
+        // Detect transient focus from parent editor selection operations. When a
+        // parent contentEditable (like ProseMirror) performs a selection using
+        // Selection.collapse() + Selection.extend() [1], and Selection.collapse()
+        // collapses to a position where CodeMirror is, the browser will fire a focus
+        // event on this CodeMirror. This focus is transient and should be ignored;
+        // otherwise, our focus logic will undo the parent’s selection.
+        // [1] https://github.com/ProseMirror/prosemirror-view/blob/76c7c47f03730b18397b94bd269ece8a9cb7f486/src/viewdesc.ts#L464-L468
+        if (event.type === "focus") {
+            let sel = getSelection(this.view.root);
+            if (sel && sel.anchorNode && !this.view.contentDOM.contains(sel.anchorNode)) {
+                return true;
+            }
+        }
+        return false;
+    }
     startMouseSelection(mouseSelection) {
         if (this.mouseSelection)
             this.mouseSelection.destroy();
@@ -4690,19 +4707,6 @@ function eventBelongsToEditor(view, event) {
         if (!node || node.nodeType == 11 ||
             ((tile = Tile.get(node)) && tile.isWidget() && !tile.isHidden && tile.widget.ignoreEvent(event)))
             return false;
-    // Detect transient focus from parent editor selection operations. When a
-    // parent contentEditable (like ProseMirror) performs a selection using
-    // Selection.collapse() + Selection.extend() [1], and Selection.collapse()
-    // collapses to a position where CodeMirror is, the browser will fire a focus
-    // event on this editor. This focus is transient and should be ignored;
-    // otherwise, our focus logic will undo the parent’s selection.
-    // [1] https://github.com/ProseMirror/prosemirror-view/blob/76c7c47f03730b18397b94bd269ece8a9cb7f486/src/viewdesc.ts#L464-L468
-    if (event.type == "focus") {
-        let sel = getSelection(view.root);
-        if (sel && sel.anchorNode && !view.contentDOM.contains(sel.anchorNode)) {
-            return false;
-        }
-    }
     return true;
 }
 const handlers = Object.create(null);

package/dist/index.js

@@ -4373,7 +4373,8 @@ class InputState {
             firefoxCopyCutHack(view.contentDOM.ownerDocument);
     }
     handleEvent(event) {
-        if (!eventBelongsToEditor(this.view, event) || this.ignoreDuringComposition(event))
+        if (!eventBelongsToEditor(this.view, event) || this.ignoreDuringComposition(event) ||
+            this.ignoreDuringTransientFocus(event))
             return;
         if (event.type == "keydown" && this.keydown(event))
             return;
@@ -4477,6 +4478,22 @@ class InputState {
         }
         return false;
     }
+    ignoreDuringTransientFocus(event) {
+        // Detect transient focus from parent editor selection operations. When a
+        // parent contentEditable (like ProseMirror) performs a selection using
+        // Selection.collapse() + Selection.extend() [1], and Selection.collapse()
+        // collapses to a position where CodeMirror is, the browser will fire a focus
+        // event on this CodeMirror. This focus is transient and should be ignored;
+        // otherwise, our focus logic will undo the parent’s selection.
+        // [1] https://github.com/ProseMirror/prosemirror-view/blob/76c7c47f03730b18397b94bd269ece8a9cb7f486/src/viewdesc.ts#L464-L468
+        if (event.type === "focus") {
+            let sel = getSelection(this.view.root);
+            if (sel && sel.anchorNode && !this.view.contentDOM.contains(sel.anchorNode)) {
+                return true;
+            }
+        }
+        return false;
+    }
     startMouseSelection(mouseSelection) {
         if (this.mouseSelection)
             this.mouseSelection.destroy();
@@ -4686,19 +4703,6 @@ function eventBelongsToEditor(view, event) {
         if (!node || node.nodeType == 11 ||
             ((tile = Tile.get(node)) && tile.isWidget() && !tile.isHidden && tile.widget.ignoreEvent(event)))
             return false;
-    // Detect transient focus from parent editor selection operations. When a
-    // parent contentEditable (like ProseMirror) performs a selection using
-    // Selection.collapse() + Selection.extend() [1], and Selection.collapse()
-    // collapses to a position where CodeMirror is, the browser will fire a focus
-    // event on this editor. This focus is transient and should be ignored;
-    // otherwise, our focus logic will undo the parent’s selection.
-    // [1] https://github.com/ProseMirror/prosemirror-view/blob/76c7c47f03730b18397b94bd269ece8a9cb7f486/src/viewdesc.ts#L464-L468
-    if (event.type == "focus") {
-        let sel = getSelection(view.root);
-        if (sel && sel.anchorNode && !view.contentDOM.contains(sel.anchorNode)) {
-            return false;
-        }
-    }
     return true;
 }
 const handlers = /*@__PURE__*/Object.create(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamakulov/codemirror-view",
-  "version": "6.39.10",
+  "version": "6.39.11",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",