npm - @codemirror/view - Versions diffs - 6.39.0-beta.4 → 6.39.0-beta.5 - Mend

@codemirror/view 6.39.0-beta.4 → 6.39.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.cjs CHANGED Viewed

@@ -2397,7 +2397,7 @@ class TileBuilder {
         for (let cur = this.blockWrappers; cur.value && cur.from <= this.pos; cur.next())
             if (cur.to >= this.pos) {
                 let wrap = new OpenWrapper(cur.from, cur.to, cur.value, cur.rank), i = this.wrappers.length;
-                while (i > 0 && this.wrappers[i - 1].rank < wrap.rank)
+                while (i > 0 && (this.wrappers[i - 1].rank - wrap.rank || this.wrappers[i - 1].to - wrap.to) < 0)
                     i--;
                 this.wrappers.splice(i, 0, wrap);
             }
@@ -2653,8 +2653,10 @@ class TileUpdate {
                 }
                 else {
                     this.cache.add(tile);
-                    if (tile instanceof MarkTile)
+                    if (tile instanceof MarkTile) {
                         activeMarks.unshift(tile.mark);
+                        openMarks++;
+                    }
                 }
                 this.openWidget = false;
             },
@@ -3229,20 +3231,18 @@ class DocView {
                 if (pos > to)
                     break;
                 let child = tile.children[i], end = pos + child.length;
+                let childRect = child.dom.getBoundingClientRect(), { height } = childRect;
+                if (measureBounds && !i)
+                    spaceAbove += childRect.top - measureBounds.top;
                 if (child instanceof BlockWrapperTile) {
                     if (end > from)
-                        scan(child, pos, child.dom.getBoundingClientRect());
+                        scan(child, pos, childRect);
                 }
                 else if (pos >= from) {
-                    let childRect = child.dom.getBoundingClientRect(), { height } = childRect;
-                    if (measureBounds && !i)
-                        spaceAbove += childRect.top - measureBounds.top;
                     if (spaceAbove > 0)
                         result.push(-spaceAbove);
                     result.push(height + spaceAbove);
                     spaceAbove = 0;
-                    if (measureBounds && i == tile.children.length - 1)
-                        spaceAbove += measureBounds.bottom - childRect.bottom;
                     if (isWider) {
                         let last = child.dom.lastChild;
                         let rects = last ? clientRectsFor(last) : [];
@@ -3258,6 +3258,8 @@ class DocView {
                         }
                     }
                 }
+                if (measureBounds && i == tile.children.length - 1)
+                    spaceAbove += measureBounds.bottom - childRect.bottom;
                 pos = end + child.breakAfter;
             }
         };

package/dist/index.js CHANGED Viewed

@@ -2393,7 +2393,7 @@ class TileBuilder {
         for (let cur = this.blockWrappers; cur.value && cur.from <= this.pos; cur.next())
             if (cur.to >= this.pos) {
                 let wrap = new OpenWrapper(cur.from, cur.to, cur.value, cur.rank), i = this.wrappers.length;
-                while (i > 0 && this.wrappers[i - 1].rank < wrap.rank)
+                while (i > 0 && (this.wrappers[i - 1].rank - wrap.rank || this.wrappers[i - 1].to - wrap.to) < 0)
                     i--;
                 this.wrappers.splice(i, 0, wrap);
             }
@@ -2649,8 +2649,10 @@ class TileUpdate {
                 }
                 else {
                     this.cache.add(tile);
-                    if (tile instanceof MarkTile)
+                    if (tile instanceof MarkTile) {
                         activeMarks.unshift(tile.mark);
+                        openMarks++;
+                    }
                 }
                 this.openWidget = false;
             },
@@ -3225,20 +3227,18 @@ class DocView {
                 if (pos > to)
                     break;
                 let child = tile.children[i], end = pos + child.length;
+                let childRect = child.dom.getBoundingClientRect(), { height } = childRect;
+                if (measureBounds && !i)
+                    spaceAbove += childRect.top - measureBounds.top;
                 if (child instanceof BlockWrapperTile) {
                     if (end > from)
-                        scan(child, pos, child.dom.getBoundingClientRect());
+                        scan(child, pos, childRect);
                 }
                 else if (pos >= from) {
-                    let childRect = child.dom.getBoundingClientRect(), { height } = childRect;
-                    if (measureBounds && !i)
-                        spaceAbove += childRect.top - measureBounds.top;
                     if (spaceAbove > 0)
                         result.push(-spaceAbove);
                     result.push(height + spaceAbove);
                     spaceAbove = 0;
-                    if (measureBounds && i == tile.children.length - 1)
-                        spaceAbove += measureBounds.bottom - childRect.bottom;
                     if (isWider) {
                         let last = child.dom.lastChild;
                         let rects = last ? clientRectsFor(last) : [];
@@ -3254,6 +3254,8 @@ class DocView {
                         }
                     }
                 }
+                if (measureBounds && i == tile.children.length - 1)
+                    spaceAbove += measureBounds.bottom - childRect.bottom;
                 pos = end + child.breakAfter;
             }
         };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/view",
-  "version": "6.39.0-beta.4",
+  "version": "6.39.0-beta.5",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",