@codemirror/view 6.19.0 → 6.20.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.20.0 (2023-09-20)
+
+### Bug fixes
+
+Fix an issue that caused `repositionTooltips` to crash when it was called on an editor without tooltips.
+
+Fix an issue that caused the tooltip system to leave empty nodes in the DOM when an editor using the `parent` option to `tooltips` is destroyed.
+
+Fix a bug that regression mouse interaction with the area of a fixed-size editor that isn't covered by the content.
+
+Fix some issues with the way `moveVertically` behaved for positions on line wrap points.
+
+Fix a bug that could cause the document DOM to be incorrectly updated on some types of viewport changes.
+
+### New features
+
+The new `getDrawSelectionConfig` function returns the `drawSelection` configuration for a given state.
+
 ## 6.19.0 (2023-09-14)
 
 ### Bug fixes

package/dist/index.cjs

@@ -581,7 +581,7 @@ function replaceRange(parent, fromI, fromOff, toI, toOff, insert, breakAtStart,
     if (toI < children.length) {
         let after = children[toI];
         // Make sure the end of the child after the update is preserved in `after`
-        if (after && toOff < after.length) {
+        if (after && (toOff < after.length || after.breakAfter && (last === null || last === void 0 ? void 0 : last.breakAfter))) {
             // If we're splitting a child, separate part of it to avoid that
             // being mangled when updating the child before the update.
             if (fromI == toI) {
@@ -3544,7 +3544,7 @@ function moveVertically(view, start, forward, distance) {
         return state.EditorSelection.cursor(startPos, start.assoc);
     let goal = start.goalColumn, startY;
     let rect = view.contentDOM.getBoundingClientRect();
-    let startCoords = view.coordsAtPos(startPos), docTop = view.documentTop;
+    let startCoords = view.coordsAtPos(startPos, start.assoc || -1), docTop = view.documentTop;
     if (startCoords) {
         if (goal == null)
             goal = startCoords.left - rect.left;
@@ -3561,8 +3561,11 @@ function moveVertically(view, start, forward, distance) {
     for (let extra = 0;; extra += 10) {
         let curY = startY + (dist + extra) * dir;
         let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
-        if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos))
-            return state.EditorSelection.cursor(pos, start.assoc, undefined, goal);
+        if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos)) {
+            let charRect = view.docView.coordsForChar(pos);
+            let assoc = !charRect || curY < charRect.top ? -1 : 1;
+            return state.EditorSelection.cursor(pos, assoc, undefined, goal);
+        }
     }
 }
 function skipAtomicRanges(atoms, pos, bias) {
@@ -3633,7 +3636,7 @@ class InputState {
         this.handleEvent = this.handleEvent.bind(this);
         view.scrollDOM.addEventListener("mousedown", (event) => {
             if (event.target == view.scrollDOM && event.clientY > view.contentDOM.getBoundingClientRect().bottom) {
-                this.handleEvent(event);
+                this.runHandlers("mousedown", event);
                 if (!event.defaultPrevented && event.button == 2) {
                     // Make sure the content covers the entire scroller height, in order
                     // to catch a native context menu click below it
@@ -3645,7 +3648,7 @@ class InputState {
         });
         view.scrollDOM.addEventListener("drop", (event) => {
             if (event.target == view.scrollDOM && event.clientY > view.contentDOM.getBoundingClientRect().bottom)
-                this.handleEvent(event);
+                this.runHandlers("drop", event);
         });
         this.notifiedFocused = view.hasFocus;
         // On Safari adding an input event handler somehow prevents an
@@ -8346,6 +8349,14 @@ function drawSelection(config = {}) {
         nativeSelectionHidden.of(true)
     ];
 }
+/**
+Retrieve the [`drawSelection`](https://codemirror.net/6/docs/ref/#view.drawSelection) configuration
+for this state. (Note that this will return a set of defaults even
+if `drawSelection` isn't enabled.)
+*/
+function getDrawSelectionConfig(state) {
+    return state.facet(selectionConfig);
+}
 function configChanged(update) {
     return update.startState.facet(selectionConfig) != update.state.facet(selectionConfig);
 }
@@ -9170,6 +9181,8 @@ const tooltipPlugin = ViewPlugin.fromClass(class {
             tooltipView.dom.remove();
             (_a = tooltipView.destroy) === null || _a === void 0 ? void 0 : _a.call(tooltipView);
         }
+        if (this.parent)
+            this.container.remove();
         (_b = this.intersectionObserver) === null || _b === void 0 ? void 0 : _b.disconnect();
         clearTimeout(this.measureTimeout);
     }
@@ -9611,8 +9624,9 @@ re-positioning or CSS change affecting the editor) that could
 invalidate the existing tooltip positions.
 */
 function repositionTooltips(view) {
-    var _a;
-    (_a = view.plugin(tooltipPlugin)) === null || _a === void 0 ? void 0 : _a.maybeMeasure();
+    let plugin = view.plugin(tooltipPlugin);
+    if (plugin)
+        plugin.maybeMeasure();
 }
 
 const panelConfig = state.Facet.define({
@@ -10330,6 +10344,7 @@ exports.closeHoverTooltips = closeHoverTooltips;
 exports.crosshairCursor = crosshairCursor;
 exports.drawSelection = drawSelection;
 exports.dropCursor = dropCursor;
+exports.getDrawSelectionConfig = getDrawSelectionConfig;
 exports.getPanel = getPanel;
 exports.getTooltip = getTooltip;
 exports.gutter = gutter;

package/dist/index.d.cts

@@ -1414,6 +1414,12 @@ layout information that's only available after laying out the
 content).
 */
 declare function drawSelection(config?: SelectionConfig): Extension;
+/**
+Retrieve the [`drawSelection`](https://codemirror.net/6/docs/ref/#view.drawSelection) configuration
+for this state. (Note that this will return a set of defaults even
+if `drawSelection` isn't enabled.)
+*/
+declare function getDrawSelectionConfig(state: EditorState): SelectionConfig;
 
 /**
 Draws a cursor at the current drop position when something is
@@ -2050,4 +2056,4 @@ trailing whitespace.
 */
 declare function highlightTrailingWhitespace(): Extension;
 
-export { BidiSpan, BlockInfo, BlockType, Command, DOMEventHandlers, DOMEventMap, Decoration, DecorationSet, Direction, EditorView, EditorViewConfig, GutterMarker, KeyBinding, LayerMarker, MatchDecorator, MouseSelectionStyle, Panel, PanelConstructor, PluginSpec, PluginValue, Rect, RectangleMarker, Tooltip, TooltipView, ViewPlugin, ViewUpdate, WidgetType, closeHoverTooltips, crosshairCursor, drawSelection, dropCursor, getPanel, getTooltip, gutter, gutterLineClass, gutters, hasHoverTooltips, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, hoverTooltip, keymap, layer, lineNumberMarkers, lineNumbers, logException, panels, placeholder, rectangularSelection, repositionTooltips, runScopeHandlers, scrollPastEnd, showPanel, showTooltip, tooltips };
+export { BidiSpan, BlockInfo, BlockType, Command, DOMEventHandlers, DOMEventMap, Decoration, DecorationSet, Direction, EditorView, EditorViewConfig, GutterMarker, KeyBinding, LayerMarker, MatchDecorator, MouseSelectionStyle, Panel, PanelConstructor, PluginSpec, PluginValue, Rect, RectangleMarker, Tooltip, TooltipView, ViewPlugin, ViewUpdate, WidgetType, closeHoverTooltips, crosshairCursor, drawSelection, dropCursor, getDrawSelectionConfig, getPanel, getTooltip, gutter, gutterLineClass, gutters, hasHoverTooltips, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, hoverTooltip, keymap, layer, lineNumberMarkers, lineNumbers, logException, panels, placeholder, rectangularSelection, repositionTooltips, runScopeHandlers, scrollPastEnd, showPanel, showTooltip, tooltips };

package/dist/index.d.ts

@@ -1414,6 +1414,12 @@ layout information that's only available after laying out the
 content).
 */
 declare function drawSelection(config?: SelectionConfig): Extension;
+/**
+Retrieve the [`drawSelection`](https://codemirror.net/6/docs/ref/#view.drawSelection) configuration
+for this state. (Note that this will return a set of defaults even
+if `drawSelection` isn't enabled.)
+*/
+declare function getDrawSelectionConfig(state: EditorState): SelectionConfig;
 
 /**
 Draws a cursor at the current drop position when something is
@@ -2050,4 +2056,4 @@ trailing whitespace.
 */
 declare function highlightTrailingWhitespace(): Extension;
 
-export { BidiSpan, BlockInfo, BlockType, Command, DOMEventHandlers, DOMEventMap, Decoration, DecorationSet, Direction, EditorView, EditorViewConfig, GutterMarker, KeyBinding, LayerMarker, MatchDecorator, MouseSelectionStyle, Panel, PanelConstructor, PluginSpec, PluginValue, Rect, RectangleMarker, Tooltip, TooltipView, ViewPlugin, ViewUpdate, WidgetType, closeHoverTooltips, crosshairCursor, drawSelection, dropCursor, getPanel, getTooltip, gutter, gutterLineClass, gutters, hasHoverTooltips, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, hoverTooltip, keymap, layer, lineNumberMarkers, lineNumbers, logException, panels, placeholder, rectangularSelection, repositionTooltips, runScopeHandlers, scrollPastEnd, showPanel, showTooltip, tooltips };
+export { BidiSpan, BlockInfo, BlockType, Command, DOMEventHandlers, DOMEventMap, Decoration, DecorationSet, Direction, EditorView, EditorViewConfig, GutterMarker, KeyBinding, LayerMarker, MatchDecorator, MouseSelectionStyle, Panel, PanelConstructor, PluginSpec, PluginValue, Rect, RectangleMarker, Tooltip, TooltipView, ViewPlugin, ViewUpdate, WidgetType, closeHoverTooltips, crosshairCursor, drawSelection, dropCursor, getDrawSelectionConfig, getPanel, getTooltip, gutter, gutterLineClass, gutters, hasHoverTooltips, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, hoverTooltip, keymap, layer, lineNumberMarkers, lineNumbers, logException, panels, placeholder, rectangularSelection, repositionTooltips, runScopeHandlers, scrollPastEnd, showPanel, showTooltip, tooltips };

package/dist/index.js

@@ -579,7 +579,7 @@ function replaceRange(parent, fromI, fromOff, toI, toOff, insert, breakAtStart,
     if (toI < children.length) {
         let after = children[toI];
         // Make sure the end of the child after the update is preserved in `after`
-        if (after && toOff < after.length) {
+        if (after && (toOff < after.length || after.breakAfter && (last === null || last === void 0 ? void 0 : last.breakAfter))) {
             // If we're splitting a child, separate part of it to avoid that
             // being mangled when updating the child before the update.
             if (fromI == toI) {
@@ -3540,7 +3540,7 @@ function moveVertically(view, start, forward, distance) {
         return EditorSelection.cursor(startPos, start.assoc);
     let goal = start.goalColumn, startY;
     let rect = view.contentDOM.getBoundingClientRect();
-    let startCoords = view.coordsAtPos(startPos), docTop = view.documentTop;
+    let startCoords = view.coordsAtPos(startPos, start.assoc || -1), docTop = view.documentTop;
     if (startCoords) {
         if (goal == null)
             goal = startCoords.left - rect.left;
@@ -3557,8 +3557,11 @@ function moveVertically(view, start, forward, distance) {
     for (let extra = 0;; extra += 10) {
         let curY = startY + (dist + extra) * dir;
         let pos = posAtCoords(view, { x: resolvedGoal, y: curY }, false, dir);
-        if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos))
-            return EditorSelection.cursor(pos, start.assoc, undefined, goal);
+        if (curY < rect.top || curY > rect.bottom || (dir < 0 ? pos < startPos : pos > startPos)) {
+            let charRect = view.docView.coordsForChar(pos);
+            let assoc = !charRect || curY < charRect.top ? -1 : 1;
+            return EditorSelection.cursor(pos, assoc, undefined, goal);
+        }
     }
 }
 function skipAtomicRanges(atoms, pos, bias) {
@@ -3629,7 +3632,7 @@ class InputState {
         this.handleEvent = this.handleEvent.bind(this);
         view.scrollDOM.addEventListener("mousedown", (event) => {
             if (event.target == view.scrollDOM && event.clientY > view.contentDOM.getBoundingClientRect().bottom) {
-                this.handleEvent(event);
+                this.runHandlers("mousedown", event);
                 if (!event.defaultPrevented && event.button == 2) {
                     // Make sure the content covers the entire scroller height, in order
                     // to catch a native context menu click below it
@@ -3641,7 +3644,7 @@ class InputState {
         });
         view.scrollDOM.addEventListener("drop", (event) => {
             if (event.target == view.scrollDOM && event.clientY > view.contentDOM.getBoundingClientRect().bottom)
-                this.handleEvent(event);
+                this.runHandlers("drop", event);
         });
         this.notifiedFocused = view.hasFocus;
         // On Safari adding an input event handler somehow prevents an
@@ -8341,6 +8344,14 @@ function drawSelection(config = {}) {
         nativeSelectionHidden.of(true)
     ];
 }
+/**
+Retrieve the [`drawSelection`](https://codemirror.net/6/docs/ref/#view.drawSelection) configuration
+for this state. (Note that this will return a set of defaults even
+if `drawSelection` isn't enabled.)
+*/
+function getDrawSelectionConfig(state) {
+    return state.facet(selectionConfig);
+}
 function configChanged(update) {
     return update.startState.facet(selectionConfig) != update.state.facet(selectionConfig);
 }
@@ -9165,6 +9176,8 @@ const tooltipPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
             tooltipView.dom.remove();
             (_a = tooltipView.destroy) === null || _a === void 0 ? void 0 : _a.call(tooltipView);
         }
+        if (this.parent)
+            this.container.remove();
         (_b = this.intersectionObserver) === null || _b === void 0 ? void 0 : _b.disconnect();
         clearTimeout(this.measureTimeout);
     }
@@ -9606,8 +9619,9 @@ re-positioning or CSS change affecting the editor) that could
 invalidate the existing tooltip positions.
 */
 function repositionTooltips(view) {
-    var _a;
-    (_a = view.plugin(tooltipPlugin)) === null || _a === void 0 ? void 0 : _a.maybeMeasure();
+    let plugin = view.plugin(tooltipPlugin);
+    if (plugin)
+        plugin.maybeMeasure();
 }
 
 const panelConfig = /*@__PURE__*/Facet.define({
@@ -10310,4 +10324,4 @@ function highlightTrailingWhitespace() {
 */
 const __test = { HeightMap, HeightOracle, MeasuredHeights, QueryType, ChangedRange, computeOrder, moveVisually };
 
-export { BidiSpan, BlockInfo, BlockType, Decoration, Direction, EditorView, GutterMarker, MatchDecorator, RectangleMarker, ViewPlugin, ViewUpdate, WidgetType, __test, closeHoverTooltips, crosshairCursor, drawSelection, dropCursor, getPanel, getTooltip, gutter, gutterLineClass, gutters, hasHoverTooltips, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, hoverTooltip, keymap, layer, lineNumberMarkers, lineNumbers, logException, panels, placeholder, rectangularSelection, repositionTooltips, runScopeHandlers, scrollPastEnd, showPanel, showTooltip, tooltips };
+export { BidiSpan, BlockInfo, BlockType, Decoration, Direction, EditorView, GutterMarker, MatchDecorator, RectangleMarker, ViewPlugin, ViewUpdate, WidgetType, __test, closeHoverTooltips, crosshairCursor, drawSelection, dropCursor, getDrawSelectionConfig, getPanel, getTooltip, gutter, gutterLineClass, gutters, hasHoverTooltips, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, hoverTooltip, keymap, layer, lineNumberMarkers, lineNumbers, logException, panels, placeholder, rectangularSelection, repositionTooltips, runScopeHandlers, scrollPastEnd, showPanel, showTooltip, tooltips };

package/package.json

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