@codemirror/view 0.20.0 → 0.20.3

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.20.3 (2022-04-27)
+
+### Bug fixes
+
+Fix a bug where the input handling could crash on repeated (or held) backspace presses on Chrome Android.
+
+## 0.20.2 (2022-04-22)
+
+### New features
+
+The new `hideOn` option to `hoverTooltip` allows more fine-grained control over when the tooltip should hide.
+
+## 0.20.1 (2022-04-20)
+
+### Bug fixes
+
+Remove debug statements that accidentally made it into 0.20.0.
+
+Fix a regression in `moveVertically`.
+
 ## 0.20.0 (2022-04-20)
 
 ### Breaking changes

package/dist/index.cjs

@@ -2880,7 +2880,8 @@ function computeCompositionDeco(view, changes) {
         topView = topView.widget.topView;
     else if (topView)
         topView.parent = null;
-    return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView) }).range(newFrom, newTo));
+    return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true })
+        .range(newFrom, newTo));
 }
 class CompositionWidget extends WidgetType {
     constructor(top, text, topView) {
@@ -3230,7 +3231,7 @@ function moveVertically(view, start, forward, distance) {
         startY = dir < 0 ? startCoords.top : startCoords.bottom;
     }
     else {
-        let line = view.viewState.lineBlockAt(startPos - docTop);
+        let line = view.viewState.lineBlockAt(startPos);
         if (goal == null)
             goal = Math.min(rect.right - rect.left, view.defaultCharacterWidth * (startPos - line.from));
         startY = (dir < 0 ? line.top : line.bottom) + docTop;
@@ -5563,6 +5564,7 @@ class DOMObserver {
                 let key = this.delayedAndroidKey;
                 this.delayedAndroidKey = null;
                 let startState = this.view.state;
+                this.readSelectionRange();
                 if (dispatchKey(this.view.contentDOM, key.key, key.keyCode))
                     this.processRecords();
                 else
@@ -8081,9 +8083,7 @@ Facet to which an extension can add a value to show a tooltip.
 const showTooltip = state.Facet.define({
     enables: [tooltipPlugin, baseTheme]
 });
-const showHoverTooltip = state.Facet.define({
-    combine(x) { console.log("show", x.map(x => !!x)); return x; }
-});
+const showHoverTooltip = state.Facet.define();
 class HoverTooltipHost {
     constructor(view) {
         this.view = view;
@@ -8123,7 +8123,6 @@ class HoverTooltipHost {
 }
 const showHoverTooltipHost = showTooltip.compute([showHoverTooltip], state => {
     let tooltips = state.facet(showHoverTooltip).filter(t => t);
-    console.log("hover tooltips: ", tooltips.length);
     if (tooltips.length === 0)
         return null;
     return {
@@ -8264,8 +8263,8 @@ function hoverTooltip(source, options = {}) {
     let hoverState = state.StateField.define({
         create() { return null; },
         update(value, tr) {
-            console.log("update tooltip", !!value);
-            if (value && (options.hideOnChange && (tr.docChanged || tr.selection)))
+            if (value && (options.hideOnChange && (tr.docChanged || tr.selection) ||
+                options.hideOn && options.hideOn(tr, value)))
                 return null;
             if (value && tr.docChanged) {
                 let newPos = tr.changes.mapPos(value.pos, -1, state.MapMode.TrackDel);
@@ -8281,9 +8280,8 @@ function hoverTooltip(source, options = {}) {
                 if (effect.is(setHover))
                     value = effect.value;
                 if (effect.is(closeHoverTooltipEffect))
-                    value = (console.log("CLOSE"), null);
+                    value = null;
             }
-            console.log("updated: " + !!value);
             return value;
         },
         provide: f => showHoverTooltip.from(f)

package/dist/index.d.ts

@@ -1546,11 +1546,16 @@ container element. This allows multiple tooltips over the same
 range to be "merged" together without overlapping.
 */
 declare function hoverTooltip(source: (view: EditorView, pos: number, side: -1 | 1) => Tooltip | null | Promise<Tooltip | null>, options?: {
+    /**
+    Controls whether a transaction hides the tooltip. The default
+    is to not hide.
+    */
+    hideOn?: (tr: Transaction, tooltip: Tooltip) => boolean;
     /**
     When enabled (this defaults to false), close the tooltip
-    whenever the document changes.
+    whenever the document changes or the selection is set.
     */
-    hideOnChange?: boolean;
+    hideOnChange?: boolean | "touch";
     /**
     Hover time after which the tooltip should appear, in
     milliseconds. Defaults to 300ms.

package/dist/index.js

@@ -2874,7 +2874,8 @@ function computeCompositionDeco(view, changes) {
         topView = topView.widget.topView;
     else if (topView)
         topView.parent = null;
-    return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView) }).range(newFrom, newTo));
+    return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true })
+        .range(newFrom, newTo));
 }
 class CompositionWidget extends WidgetType {
     constructor(top, text, topView) {
@@ -3224,7 +3225,7 @@ function moveVertically(view, start, forward, distance) {
         startY = dir < 0 ? startCoords.top : startCoords.bottom;
     }
     else {
-        let line = view.viewState.lineBlockAt(startPos - docTop);
+        let line = view.viewState.lineBlockAt(startPos);
         if (goal == null)
             goal = Math.min(rect.right - rect.left, view.defaultCharacterWidth * (startPos - line.from));
         startY = (dir < 0 ? line.top : line.bottom) + docTop;
@@ -5556,6 +5557,7 @@ class DOMObserver {
                 let key = this.delayedAndroidKey;
                 this.delayedAndroidKey = null;
                 let startState = this.view.state;
+                this.readSelectionRange();
                 if (dispatchKey(this.view.contentDOM, key.key, key.keyCode))
                     this.processRecords();
                 else
@@ -8074,9 +8076,7 @@ Facet to which an extension can add a value to show a tooltip.
 const showTooltip = /*@__PURE__*/Facet.define({
     enables: [tooltipPlugin, baseTheme]
 });
-const showHoverTooltip = /*@__PURE__*/Facet.define({
-    combine(x) { console.log("show", x.map(x => !!x)); return x; }
-});
+const showHoverTooltip = /*@__PURE__*/Facet.define();
 class HoverTooltipHost {
     constructor(view) {
         this.view = view;
@@ -8116,7 +8116,6 @@ class HoverTooltipHost {
 }
 const showHoverTooltipHost = /*@__PURE__*/showTooltip.compute([showHoverTooltip], state => {
     let tooltips = state.facet(showHoverTooltip).filter(t => t);
-    console.log("hover tooltips: ", tooltips.length);
     if (tooltips.length === 0)
         return null;
     return {
@@ -8257,8 +8256,8 @@ function hoverTooltip(source, options = {}) {
     let hoverState = StateField.define({
         create() { return null; },
         update(value, tr) {
-            console.log("update tooltip", !!value);
-            if (value && (options.hideOnChange && (tr.docChanged || tr.selection)))
+            if (value && (options.hideOnChange && (tr.docChanged || tr.selection) ||
+                options.hideOn && options.hideOn(tr, value)))
                 return null;
             if (value && tr.docChanged) {
                 let newPos = tr.changes.mapPos(value.pos, -1, MapMode.TrackDel);
@@ -8274,9 +8273,8 @@ function hoverTooltip(source, options = {}) {
                 if (effect.is(setHover))
                     value = effect.value;
                 if (effect.is(closeHoverTooltipEffect))
-                    value = (console.log("CLOSE"), null);
+                    value = null;
             }
-            console.log("updated: " + !!value);
             return value;
         },
         provide: f => showHoverTooltip.from(f)

package/package.json

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