@codemirror/view 6.0.0 → 6.0.1

package/.github/workflows/dispatch.yml

@@ -11,6 +11,6 @@ jobs:
         with:
           # You should create a personal access token and store it in your repository
           token: ${{ secrets.DISPATCH_AUTH }}
-          repo: codemirror.next
+          repo: dev
           owner: codemirror
           event_type: push

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.0.1 (2022-06-17)
+
+### Bug fixes
+
+Avoid DOM selection corruption when the editor doesn't have focus but has selection and updates its content.
+
+Fall back to dispatching by key code when a key event produces a non-ASCII character (so that Cyrillic and Arabic keyboards can still use bindings specified with Latin characters).
+
 ## 6.0.0 (2022-06-08)
 
 ### New features

package/README.md

@@ -1,13 +1,13 @@
 # @codemirror/view [![NPM version](https://img.shields.io/npm/v/@codemirror/view.svg)](https://www.npmjs.org/package/@codemirror/view)
 
-[ [**WEBSITE**](https://codemirror.net/6/) | [**DOCS**](https://codemirror.net/6/docs/ref/#view) | [**ISSUES**](https://github.com/codemirror/codemirror.next/issues) | [**FORUM**](https://discuss.codemirror.net/c/next/) | [**CHANGELOG**](https://github.com/codemirror/view/blob/main/CHANGELOG.md) ]
+[ [**WEBSITE**](https://codemirror.net/) | [**DOCS**](https://codemirror.net/docs/ref/#view) | [**ISSUES**](https://github.com/codemirror/dev/issues) | [**FORUM**](https://discuss.codemirror.net/c/next/) | [**CHANGELOG**](https://github.com/codemirror/view/blob/main/CHANGELOG.md) ]
 
 This package implements the DOM view component for the
-[CodeMirror](https://codemirror.net/6/) code editor.
+[CodeMirror](https://codemirror.net/) code editor.
 
-The [project page](https://codemirror.net/6/) has more information, a
-number of [examples](https://codemirror.net/6/examples/) and the
-[documentation](https://codemirror.net/6/docs/).
+The [project page](https://codemirror.net/) has more information, a
+number of [examples](https://codemirror.net/examples/) and the
+[documentation](https://codemirror.net/docs/).
 
 This code is released under an
 [MIT license](https://github.com/codemirror/view/tree/main/LICENSE).

package/dist/index.cjs

@@ -2545,7 +2545,7 @@ class DocView extends ContentView {
     }
     // Sync the DOM selection to this.state.selection
     updateSelection(mustRead = false, fromPointer = false) {
-        if (mustRead)
+        if (mustRead || !this.view.observer.selectionRange.focusNode)
             this.view.observer.readSelectionRange();
         if (!(fromPointer || this.mayControlSelection()) ||
             browser.ios && this.view.inputState.rapidCompositionStart)
@@ -2580,7 +2580,8 @@ class DocView extends ContentView {
                     this.dom.focus({ preventScroll: true });
                 }
                 let rawSel = getSelection(this.root);
-                if (main.empty) {
+                if (!rawSel) ;
+                else if (main.empty) {
                     // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=1612076
                     if (browser.gecko) {
                         let nextTo = nextToUneditable(anchor.node, anchor.offset);
@@ -2622,7 +2623,7 @@ class DocView extends ContentView {
             return;
         let cursor = this.view.state.selection.main;
         let sel = getSelection(this.root);
-        if (!cursor.empty || !cursor.assoc || !sel.modify)
+        if (!sel || !cursor.empty || !cursor.assoc || !sel.modify)
             return;
         let line = LineView.find(this, cursor.head);
         if (!line)
@@ -2638,8 +2639,9 @@ class DocView extends ContentView {
         sel.modify("move", cursor.assoc < 0 ? "forward" : "backward", "lineboundary");
     }
     mayControlSelection() {
-        return this.view.state.facet(editable) ? this.root.activeElement == this.dom
-            : hasSelection(this.dom, this.view.observer.selectionRange);
+        let active = this.root.activeElement;
+        return active == this.dom ||
+            hasSelection(this.dom, this.view.observer.selectionRange) && !(active && this.dom.contains(active));
     }
     nearest(dom) {
         for (let cur = dom; cur;) {
@@ -3536,7 +3538,7 @@ function isInPrimarySelection(view, event) {
     // On boundary clicks, check whether the coordinates are inside the
     // selection's client rectangles
     let sel = getSelection(view.root);
-    if (sel.rangeCount == 0)
+    if (!sel || sel.rangeCount == 0)
         return true;
     let rects = sel.getRangeAt(0).getClientRects();
     for (let i = 0; i < rects.length; i++) {
@@ -5495,12 +5497,12 @@ class DOMObserver {
             this.flush(false);
     }
     readSelectionRange() {
-        let { root } = this.view, domSel = getSelection(root);
+        let { root } = this.view;
         // The Selection object is broken in shadow roots in Safari. See
-        // https://github.com/codemirror/codemirror.next/issues/414
+        // https://github.com/codemirror/dev/issues/414
         let range = browser.safari && root.nodeType == 11 && deepActiveElement() == this.view.contentDOM &&
-            safariSelectionRangeHack(this.view) || domSel;
-        if (this.selectionRange.eq(range))
+            safariSelectionRangeHack(this.view) || getSelection(root);
+        if (!range || this.selectionRange.eq(range))
             return false;
         this.selectionRange.setRange(range);
         return this.selectionChanged = true;
@@ -6966,7 +6968,8 @@ function buildKeymap(bindings, platform = currentPlatform) {
     return bound;
 }
 function runHandlers(map, event, view, scope) {
-    let name = w3cKeyname.keyName(event), isChar = name.length == 1 && name != " ";
+    let name = w3cKeyname.keyName(event);
+    let charCode = state.codePointAt(name, 0), isChar = state.codePointSize(charCode) == name.length && name != " ";
     let prefix = "", fallthrough = false;
     if (storedPrefix && storedPrefix.view == view && storedPrefix.scope == scope) {
         prefix = storedPrefix.prefix + " ";
@@ -6987,10 +6990,13 @@ function runHandlers(map, event, view, scope) {
     if (scopeObj) {
         if (runFor(scopeObj[prefix + modifiers(name, event, !isChar)]))
             return true;
-        if (isChar && (event.shiftKey || event.altKey || event.metaKey) &&
+        if (isChar && (event.shiftKey || event.altKey || event.metaKey || charCode > 127) &&
             (baseName = w3cKeyname.base[event.keyCode]) && baseName != name) {
             if (runFor(scopeObj[prefix + modifiers(baseName, event, true)]))
                 return true;
+            else if (event.shiftKey && w3cKeyname.shift[event.keyCode] != baseName &&
+                runFor(scopeObj[prefix + modifiers(w3cKeyname.shift[event.keyCode], event, false)]))
+                return true;
         }
         else if (isChar && event.shiftKey) {
             if (runFor(scopeObj[prefix + modifiers(name, event, true)]))

package/dist/index.js

@@ -1,6 +1,6 @@
-import { Text, RangeSet, MapMode, RangeValue, Facet, StateEffect, ChangeSet, findClusterBreak, EditorSelection, EditorState, findColumn, CharCategory, Prec, Transaction, combineConfig, StateField, RangeSetBuilder, codePointAt, countColumn } from '@codemirror/state';
+import { Text, RangeSet, MapMode, RangeValue, Facet, StateEffect, ChangeSet, findClusterBreak, EditorSelection, EditorState, findColumn, CharCategory, Prec, Transaction, codePointAt, codePointSize, combineConfig, StateField, RangeSetBuilder, countColumn } from '@codemirror/state';
 import { StyleModule } from 'style-mod';
-import { keyName, base } from 'w3c-keyname';
+import { keyName, base, shift } from 'w3c-keyname';
 
 function getSelection(root) {
     let target;
@@ -2539,7 +2539,7 @@ class DocView extends ContentView {
     }
     // Sync the DOM selection to this.state.selection
     updateSelection(mustRead = false, fromPointer = false) {
-        if (mustRead)
+        if (mustRead || !this.view.observer.selectionRange.focusNode)
             this.view.observer.readSelectionRange();
         if (!(fromPointer || this.mayControlSelection()) ||
             browser.ios && this.view.inputState.rapidCompositionStart)
@@ -2574,7 +2574,8 @@ class DocView extends ContentView {
                     this.dom.focus({ preventScroll: true });
                 }
                 let rawSel = getSelection(this.root);
-                if (main.empty) {
+                if (!rawSel) ;
+                else if (main.empty) {
                     // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=1612076
                     if (browser.gecko) {
                         let nextTo = nextToUneditable(anchor.node, anchor.offset);
@@ -2616,7 +2617,7 @@ class DocView extends ContentView {
             return;
         let cursor = this.view.state.selection.main;
         let sel = getSelection(this.root);
-        if (!cursor.empty || !cursor.assoc || !sel.modify)
+        if (!sel || !cursor.empty || !cursor.assoc || !sel.modify)
             return;
         let line = LineView.find(this, cursor.head);
         if (!line)
@@ -2632,8 +2633,9 @@ class DocView extends ContentView {
         sel.modify("move", cursor.assoc < 0 ? "forward" : "backward", "lineboundary");
     }
     mayControlSelection() {
-        return this.view.state.facet(editable) ? this.root.activeElement == this.dom
-            : hasSelection(this.dom, this.view.observer.selectionRange);
+        let active = this.root.activeElement;
+        return active == this.dom ||
+            hasSelection(this.dom, this.view.observer.selectionRange) && !(active && this.dom.contains(active));
     }
     nearest(dom) {
         for (let cur = dom; cur;) {
@@ -3530,7 +3532,7 @@ function isInPrimarySelection(view, event) {
     // On boundary clicks, check whether the coordinates are inside the
     // selection's client rectangles
     let sel = getSelection(view.root);
-    if (sel.rangeCount == 0)
+    if (!sel || sel.rangeCount == 0)
         return true;
     let rects = sel.getRangeAt(0).getClientRects();
     for (let i = 0; i < rects.length; i++) {
@@ -5488,12 +5490,12 @@ class DOMObserver {
             this.flush(false);
     }
     readSelectionRange() {
-        let { root } = this.view, domSel = getSelection(root);
+        let { root } = this.view;
         // The Selection object is broken in shadow roots in Safari. See
-        // https://github.com/codemirror/codemirror.next/issues/414
+        // https://github.com/codemirror/dev/issues/414
         let range = browser.safari && root.nodeType == 11 && deepActiveElement() == this.view.contentDOM &&
-            safariSelectionRangeHack(this.view) || domSel;
-        if (this.selectionRange.eq(range))
+            safariSelectionRangeHack(this.view) || getSelection(root);
+        if (!range || this.selectionRange.eq(range))
             return false;
         this.selectionRange.setRange(range);
         return this.selectionChanged = true;
@@ -6959,7 +6961,8 @@ function buildKeymap(bindings, platform = currentPlatform) {
     return bound;
 }
 function runHandlers(map, event, view, scope) {
-    let name = keyName(event), isChar = name.length == 1 && name != " ";
+    let name = keyName(event);
+    let charCode = codePointAt(name, 0), isChar = codePointSize(charCode) == name.length && name != " ";
     let prefix = "", fallthrough = false;
     if (storedPrefix && storedPrefix.view == view && storedPrefix.scope == scope) {
         prefix = storedPrefix.prefix + " ";
@@ -6980,10 +6983,13 @@ function runHandlers(map, event, view, scope) {
     if (scopeObj) {
         if (runFor(scopeObj[prefix + modifiers(name, event, !isChar)]))
             return true;
-        if (isChar && (event.shiftKey || event.altKey || event.metaKey) &&
+        if (isChar && (event.shiftKey || event.altKey || event.metaKey || charCode > 127) &&
             (baseName = base[event.keyCode]) && baseName != name) {
             if (runFor(scopeObj[prefix + modifiers(baseName, event, true)]))
                 return true;
+            else if (event.shiftKey && shift[event.keyCode] != baseName &&
+                runFor(scopeObj[prefix + modifiers(shift[event.keyCode], event, false)]))
+                return true;
         }
         else if (isChar && event.shiftKey) {
             if (runFor(scopeObj[prefix + modifiers(name, event, true)]))

package/package.json

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