@codemirror/view 6.42.0 → 6.43.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.43.0 (2026-05-14)
+
+### New features
+
+Block wrappers can now be given a rank to set a specific nesting order for wrappers coming from the same source.
+
+## 6.42.1 (2026-05-07)
+
+### Bug fixes
+
+Fix a bug where block wrappers could be applied incorrectly during composition.
+
+Fix an issue leading to constant text geometry resets in variable-width fonts.
+
 ## 6.42.0 (2026-05-06)
 
 ### Bug fixes

package/dist/index.cjs

@@ -395,10 +395,23 @@ widget that starts inside its range, including blocks starting
 directly at `from` but not including `to`.
 */
 class BlockWrapper extends state.RangeValue {
-    constructor(tagName, attributes) {
+    constructor(
+    /**
+    @internal
+    */
+    tagName, 
+    /**
+    @internal
+    */
+    attributes, 
+    /**
+    @internal
+    */
+    rank) {
         super();
         this.tagName = tagName;
         this.attributes = attributes;
+        this.rank = rank;
     }
     eq(other) {
         return other == this ||
@@ -409,7 +422,7 @@ class BlockWrapper extends state.RangeValue {
     attributes.
     */
     static create(spec) {
-        return new BlockWrapper(spec.tagName, spec.attributes || noAttrs);
+        return new BlockWrapper(spec.tagName, spec.attributes || noAttrs, spec.rank == null ? 50 : Math.max(0, Math.min(spec.rank, 100)));
     }
     /**
     Create a range set from the given block wrapper ranges.
@@ -2311,6 +2324,7 @@ class TileBuilder {
             this.cache.reused.set(oldTile, 2 /* Reused.DOM */);
         let text = new TextTile(composition.text, composition.text.nodeValue);
         text.flags |= 8 /* TileFlag.Composition */;
+        this.pos = composition.range.toB;
         head.append(text);
     }
     addInlineWidget(widget, marks, openStart) {
@@ -2409,7 +2423,8 @@ class TileBuilder {
                 this.wrappers.splice(i, 1);
         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;
+                let rank = (cur.rank * 102) + cur.value.rank;
+                let wrap = new OpenWrapper(cur.from, cur.to, cur.value, rank), i = this.wrappers.length;
                 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);
@@ -5345,8 +5360,7 @@ class HeightOracle {
     }
     refresh(whiteSpace, lineHeight, charWidth, textHeight, lineLength, knownHeights) {
         let lineWrapping = wrappingWhiteSpace.indexOf(whiteSpace) > -1;
-        let changed = Math.abs(lineHeight - this.lineHeight) > 0.3 || this.lineWrapping != lineWrapping ||
-            Math.abs(charWidth - this.charWidth) > 0.1;
+        let changed = Math.abs(lineHeight - this.lineHeight) > 0.3 || this.lineWrapping != lineWrapping;
         this.lineWrapping = lineWrapping;
         this.lineHeight = lineHeight;
         this.charWidth = charWidth;

package/dist/index.d.cts

@@ -366,6 +366,13 @@ interface BlockWrapperSpec {
     attributes?: {
         [key: string]: string;
     };
+    /**
+    When multiple overlapping block wrappers are produced by the
+    same source, this determines their relative precedence. Lower
+    rank wrappers are nested inside higher-rank ones. Should be
+    a number between 0 and 100.
+    */
+    rank?: number;
 }
 /**
 A block wrapper defines a DOM node that wraps lines or other block
@@ -374,8 +381,6 @@ widget that starts inside its range, including blocks starting
 directly at `from` but not including `to`.
 */
 declare class BlockWrapper extends RangeValue {
-    readonly tagName: string;
-    readonly attributes: Attrs;
     private constructor();
     eq(other: RangeValue): boolean;
     /**

package/dist/index.d.ts

@@ -366,6 +366,13 @@ interface BlockWrapperSpec {
     attributes?: {
         [key: string]: string;
     };
+    /**
+    When multiple overlapping block wrappers are produced by the
+    same source, this determines their relative precedence. Lower
+    rank wrappers are nested inside higher-rank ones. Should be
+    a number between 0 and 100.
+    */
+    rank?: number;
 }
 /**
 A block wrapper defines a DOM node that wraps lines or other block
@@ -374,8 +381,6 @@ widget that starts inside its range, including blocks starting
 directly at `from` but not including `to`.
 */
 declare class BlockWrapper extends RangeValue {
-    readonly tagName: string;
-    readonly attributes: Attrs;
     private constructor();
     eq(other: RangeValue): boolean;
     /**

package/dist/index.js

@@ -392,10 +392,23 @@ widget that starts inside its range, including blocks starting
 directly at `from` but not including `to`.
 */
 class BlockWrapper extends RangeValue {
-    constructor(tagName, attributes) {
+    constructor(
+    /**
+    @internal
+    */
+    tagName, 
+    /**
+    @internal
+    */
+    attributes, 
+    /**
+    @internal
+    */
+    rank) {
         super();
         this.tagName = tagName;
         this.attributes = attributes;
+        this.rank = rank;
     }
     eq(other) {
         return other == this ||
@@ -406,7 +419,7 @@ class BlockWrapper extends RangeValue {
     attributes.
     */
     static create(spec) {
-        return new BlockWrapper(spec.tagName, spec.attributes || noAttrs);
+        return new BlockWrapper(spec.tagName, spec.attributes || noAttrs, spec.rank == null ? 50 : Math.max(0, Math.min(spec.rank, 100)));
     }
     /**
     Create a range set from the given block wrapper ranges.
@@ -2307,6 +2320,7 @@ class TileBuilder {
             this.cache.reused.set(oldTile, 2 /* Reused.DOM */);
         let text = new TextTile(composition.text, composition.text.nodeValue);
         text.flags |= 8 /* TileFlag.Composition */;
+        this.pos = composition.range.toB;
         head.append(text);
     }
     addInlineWidget(widget, marks, openStart) {
@@ -2405,7 +2419,8 @@ class TileBuilder {
                 this.wrappers.splice(i, 1);
         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;
+                let rank = (cur.rank * 102) + cur.value.rank;
+                let wrap = new OpenWrapper(cur.from, cur.to, cur.value, rank), i = this.wrappers.length;
                 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);
@@ -5341,8 +5356,7 @@ class HeightOracle {
     }
     refresh(whiteSpace, lineHeight, charWidth, textHeight, lineLength, knownHeights) {
         let lineWrapping = wrappingWhiteSpace.indexOf(whiteSpace) > -1;
-        let changed = Math.abs(lineHeight - this.lineHeight) > 0.3 || this.lineWrapping != lineWrapping ||
-            Math.abs(charWidth - this.charWidth) > 0.1;
+        let changed = Math.abs(lineHeight - this.lineHeight) > 0.3 || this.lineWrapping != lineWrapping;
         this.lineWrapping = lineWrapping;
         this.lineHeight = lineHeight;
         this.charWidth = charWidth;

package/package.json

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