@codemirror/view 0.19.15 → 0.19.16

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.19.16 (2021-11-11)
+
+### Breaking changes
+
+Block replacement decorations now default to inclusive, because non-inclusive block decorations are rarely what you need.
+
+### Bug fixes
+
+Fix an issue that caused block widgets to always have a large side value, making it impossible to show them between to replacement decorations.
+
+Fix a crash that could happen after some types of viewport changes, due to a bug in the block widget view data structure.
+
 ## 0.19.15 (2021-11-09)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1084,8 +1084,6 @@ class Decoration extends rangeset.RangeValue {
     */
     static widget(spec) {
         let side = spec.side || 0;
-        if (spec.block)
-            side += (200000000 /* BigBlock */ + 1) * (side > 0 ? 1 : -1);
         return new PointDecoration(spec, side, side, !!spec.block, spec.widget || null, false);
     }
     /**
@@ -1094,9 +1092,9 @@ class Decoration extends rangeset.RangeValue {
     */
     static replace(spec) {
         let block = !!spec.block;
-        let { start, end } = getInclusive(spec);
-        let startSide = block ? -200000000 /* BigBlock */ * (start ? 2 : 1) : 100000000 /* BigInline */ * (start ? -1 : 1);
-        let endSide = block ? 200000000 /* BigBlock */ * (end ? 2 : 1) : 100000000 /* BigInline */ * (end ? 1 : -1);
+        let { start, end } = getInclusive(spec, block);
+        let startSide = 100000000 /* Big */ * (start ? -1 : 1) * (block ? 2 : 1);
+        let endSide = 100000000 /* Big */ * (end ? 1 : -1) * (block ? 2 : 1);
         return new PointDecoration(spec, startSide, endSide, block, spec.widget || null, true);
     }
     /**
@@ -1126,7 +1124,7 @@ Decoration.none = rangeset.RangeSet.empty;
 class MarkDecoration extends Decoration {
     constructor(spec) {
         let { start, end } = getInclusive(spec);
-        super(100000000 /* BigInline */ * (start ? -1 : 1), 100000000 /* BigInline */ * (end ? 1 : -1), null, spec);
+        super(100000000 /* Big */ * (start ? -1 : 1), 100000000 /* Big */ * (end ? 1 : -1), null, spec);
         this.tagName = spec.tagName || "span";
         this.class = spec.class || "";
         this.attrs = spec.attributes || null;
@@ -1147,7 +1145,7 @@ class MarkDecoration extends Decoration {
 MarkDecoration.prototype.point = false;
 class LineDecoration extends Decoration {
     constructor(spec) {
-        super(-100000000 /* BigInline */, -100000000 /* BigInline */, null, spec);
+        super(-100000000 /* Big */, -100000000 /* Big */, null, spec);
     }
     eq(other) {
         return other instanceof LineDecoration && attrsEq(this.spec.attributes, other.spec.attributes);
@@ -1188,13 +1186,13 @@ class PointDecoration extends Decoration {
     }
 }
 PointDecoration.prototype.point = true;
-function getInclusive(spec) {
+function getInclusive(spec, block = false) {
     let { inclusiveStart: start, inclusiveEnd: end } = spec;
     if (start == null)
         start = spec.inclusive;
     if (end == null)
         end = spec.inclusive;
-    return { start: start || false, end: end || false };
+    return { start: start !== null && start !== void 0 ? start : block, end: end !== null && end !== void 0 ? end : block };
 }
 function widgetsEq(a, b) {
     return a == b || !!(a && b && a.compare(b));
@@ -1362,7 +1360,9 @@ class BlockWidgetView extends ContentView {
     split(at) {
         let len = this.length - at;
         this.length = at;
-        return new BlockWidgetView(this.widget, len, this.type);
+        let end = new BlockWidgetView(this.widget, len, this.type);
+        end.breakAfter = this.breakAfter;
+        return end;
     }
     get children() { return none$1; }
     sync() {

package/dist/index.d.ts

@@ -91,7 +91,8 @@ interface ReplaceDecorationSpec {
     /**
     Whether this range covers the positions on its sides. This
     influences whether new content becomes part of the range and
-    whether the cursor can be drawn on its sides. Defaults to false.
+    whether the cursor can be drawn on its sides. Defaults to false
+    for inline replacements, and true for block replacements.
     */
     inclusive?: boolean;
     /**

package/dist/index.js

@@ -1080,8 +1080,6 @@ class Decoration extends RangeValue {
     */
     static widget(spec) {
         let side = spec.side || 0;
-        if (spec.block)
-            side += (200000000 /* BigBlock */ + 1) * (side > 0 ? 1 : -1);
         return new PointDecoration(spec, side, side, !!spec.block, spec.widget || null, false);
     }
     /**
@@ -1090,9 +1088,9 @@ class Decoration extends RangeValue {
     */
     static replace(spec) {
         let block = !!spec.block;
-        let { start, end } = getInclusive(spec);
-        let startSide = block ? -200000000 /* BigBlock */ * (start ? 2 : 1) : 100000000 /* BigInline */ * (start ? -1 : 1);
-        let endSide = block ? 200000000 /* BigBlock */ * (end ? 2 : 1) : 100000000 /* BigInline */ * (end ? 1 : -1);
+        let { start, end } = getInclusive(spec, block);
+        let startSide = 100000000 /* Big */ * (start ? -1 : 1) * (block ? 2 : 1);
+        let endSide = 100000000 /* Big */ * (end ? 1 : -1) * (block ? 2 : 1);
         return new PointDecoration(spec, startSide, endSide, block, spec.widget || null, true);
     }
     /**
@@ -1122,7 +1120,7 @@ Decoration.none = RangeSet.empty;
 class MarkDecoration extends Decoration {
     constructor(spec) {
         let { start, end } = getInclusive(spec);
-        super(100000000 /* BigInline */ * (start ? -1 : 1), 100000000 /* BigInline */ * (end ? 1 : -1), null, spec);
+        super(100000000 /* Big */ * (start ? -1 : 1), 100000000 /* Big */ * (end ? 1 : -1), null, spec);
         this.tagName = spec.tagName || "span";
         this.class = spec.class || "";
         this.attrs = spec.attributes || null;
@@ -1143,7 +1141,7 @@ class MarkDecoration extends Decoration {
 MarkDecoration.prototype.point = false;
 class LineDecoration extends Decoration {
     constructor(spec) {
-        super(-100000000 /* BigInline */, -100000000 /* BigInline */, null, spec);
+        super(-100000000 /* Big */, -100000000 /* Big */, null, spec);
     }
     eq(other) {
         return other instanceof LineDecoration && attrsEq(this.spec.attributes, other.spec.attributes);
@@ -1184,13 +1182,13 @@ class PointDecoration extends Decoration {
     }
 }
 PointDecoration.prototype.point = true;
-function getInclusive(spec) {
+function getInclusive(spec, block = false) {
     let { inclusiveStart: start, inclusiveEnd: end } = spec;
     if (start == null)
         start = spec.inclusive;
     if (end == null)
         end = spec.inclusive;
-    return { start: start || false, end: end || false };
+    return { start: start !== null && start !== void 0 ? start : block, end: end !== null && end !== void 0 ? end : block };
 }
 function widgetsEq(a, b) {
     return a == b || !!(a && b && a.compare(b));
@@ -1358,7 +1356,9 @@ class BlockWidgetView extends ContentView {
     split(at) {
         let len = this.length - at;
         this.length = at;
-        return new BlockWidgetView(this.widget, len, this.type);
+        let end = new BlockWidgetView(this.widget, len, this.type);
+        end.breakAfter = this.breakAfter;
+        return end;
     }
     get children() { return none$1; }
     sync() {

package/package.json

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