@codemirror/view 6.20.2 → 6.21.1

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 6.21.1 (2023-10-02)
+
+### Bug fixes
+
+Fix a bug that could corrupt the DOM view for specific changes involving newlines and mark decorations.
+
+## 6.21.0 (2023-09-29)
+
+### Bug fixes
+
+Fix a bug that could cause zero-length widgets at the start of a line to be left in the view even after they were removed.
+
+### New features
+
+`RectangleMarker`'s dimension properties are now public.
+
 ## 6.20.2 (2023-09-25)
 
 ### Bug fixes

package/dist/index.cjs

@@ -596,7 +596,7 @@ function replaceRange(parent, fromI, fromOff, toI, toOff, insert, breakAtStart,
             else {
                 // Remove the start of the after element, if necessary, and
                 // add it to `content`.
-                if (toOff)
+                if (toOff || after.children.length && !after.children[0].length)
                     after.merge(0, toOff, null, false, 0, openEnd);
                 insert.push(after);
             }
@@ -1653,7 +1653,8 @@ class ContentBuilder {
             this.flushBuffer();
         else
             this.pendingBuffer = 0 /* Buf.No */;
-        if (!openEnd && !this.posCovered())
+        if (!this.posCovered() &&
+            !(openEnd && this.content.length && this.content[this.content.length - 1] instanceof BlockWidgetView))
             this.getLine();
     }
     buildText(length, active, openStart) {
@@ -8087,7 +8088,23 @@ class RectangleMarker {
     Create a marker with the given class and dimensions. If `width`
     is null, the DOM element will get no width style.
     */
-    constructor(className, left, top, width, height) {
+    constructor(className, 
+    /**
+    The left position of the marker (in pixels, document-relative).
+    */
+    left, 
+    /**
+    The top position of the marker.
+    */
+    top, 
+    /**
+    The width of the marker, or null if it shouldn't get a width assigned.
+    */
+    width, 
+    /**
+    The height of the marker.
+    */
+    height) {
         this.className = className;
         this.left = left;
         this.top = top;

package/dist/index.d.cts

@@ -1519,15 +1519,43 @@ a rectangle at a given set of coordinates.
 */
 declare class RectangleMarker implements LayerMarker {
     private className;
-    private left;
-    private top;
-    private width;
-    private height;
+    /**
+    The left position of the marker (in pixels, document-relative).
+    */
+    readonly left: number;
+    /**
+    The top position of the marker.
+    */
+    readonly top: number;
+    /**
+    The width of the marker, or null if it shouldn't get a width assigned.
+    */
+    readonly width: number | null;
+    /**
+    The height of the marker.
+    */
+    readonly height: number;
     /**
     Create a marker with the given class and dimensions. If `width`
     is null, the DOM element will get no width style.
     */
-    constructor(className: string, left: number, top: number, width: number | null, height: number);
+    constructor(className: string, 
+    /**
+    The left position of the marker (in pixels, document-relative).
+    */
+    left: number, 
+    /**
+    The top position of the marker.
+    */
+    top: number, 
+    /**
+    The width of the marker, or null if it shouldn't get a width assigned.
+    */
+    width: number | null, 
+    /**
+    The height of the marker.
+    */
+    height: number);
     draw(): HTMLDivElement;
     update(elt: HTMLElement, prev: RectangleMarker): boolean;
     private adjust;

package/dist/index.d.ts

@@ -1519,15 +1519,43 @@ a rectangle at a given set of coordinates.
 */
 declare class RectangleMarker implements LayerMarker {
     private className;
-    private left;
-    private top;
-    private width;
-    private height;
+    /**
+    The left position of the marker (in pixels, document-relative).
+    */
+    readonly left: number;
+    /**
+    The top position of the marker.
+    */
+    readonly top: number;
+    /**
+    The width of the marker, or null if it shouldn't get a width assigned.
+    */
+    readonly width: number | null;
+    /**
+    The height of the marker.
+    */
+    readonly height: number;
     /**
     Create a marker with the given class and dimensions. If `width`
     is null, the DOM element will get no width style.
     */
-    constructor(className: string, left: number, top: number, width: number | null, height: number);
+    constructor(className: string, 
+    /**
+    The left position of the marker (in pixels, document-relative).
+    */
+    left: number, 
+    /**
+    The top position of the marker.
+    */
+    top: number, 
+    /**
+    The width of the marker, or null if it shouldn't get a width assigned.
+    */
+    width: number | null, 
+    /**
+    The height of the marker.
+    */
+    height: number);
     draw(): HTMLDivElement;
     update(elt: HTMLElement, prev: RectangleMarker): boolean;
     private adjust;

package/dist/index.js

@@ -594,7 +594,7 @@ function replaceRange(parent, fromI, fromOff, toI, toOff, insert, breakAtStart,
             else {
                 // Remove the start of the after element, if necessary, and
                 // add it to `content`.
-                if (toOff)
+                if (toOff || after.children.length && !after.children[0].length)
                     after.merge(0, toOff, null, false, 0, openEnd);
                 insert.push(after);
             }
@@ -1650,7 +1650,8 @@ class ContentBuilder {
             this.flushBuffer();
         else
             this.pendingBuffer = 0 /* Buf.No */;
-        if (!openEnd && !this.posCovered())
+        if (!this.posCovered() &&
+            !(openEnd && this.content.length && this.content[this.content.length - 1] instanceof BlockWidgetView))
             this.getLine();
     }
     buildText(length, active, openStart) {
@@ -8082,7 +8083,23 @@ class RectangleMarker {
     Create a marker with the given class and dimensions. If `width`
     is null, the DOM element will get no width style.
     */
-    constructor(className, left, top, width, height) {
+    constructor(className, 
+    /**
+    The left position of the marker (in pixels, document-relative).
+    */
+    left, 
+    /**
+    The top position of the marker.
+    */
+    top, 
+    /**
+    The width of the marker, or null if it shouldn't get a width assigned.
+    */
+    width, 
+    /**
+    The height of the marker.
+    */
+    height) {
         this.className = className;
         this.left = left;
         this.top = top;

package/package.json

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