@codemirror/state 0.19.5 → 0.19.9

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 0.19.9 (2022-02-16)
+
+### Bug fixes
+
+Mapping a non-empty selection range now always puts any newly inserted text on the sides of the range outside of the mapped version.
+
+## 0.19.8 (2022-02-15)
+
+### Bug fixes
+
+Fix a bug where facet values with computed inputs could incorrectly retain their old value on reconfiguration.
+
+## 0.19.7 (2022-02-11)
+
+### Bug fixes
+
+Avoid recomputing facets on state reconfiguration if that facet's inputs stayed precisely the same.
+
+Selection ranges created with `EditorSelection.range` will now have an assoc pointing at their anchor, when non-empty.
+
+## 0.19.6 (2021-11-19)
+
+### Bug fixes
+
+Fix a bug that caused facet compare functions to be called with an invalid value in some situations.
+
+Fix a bug that caused dynamic facet values to be incorrectly kept unchanged when reconfiguration changed one of their dependencies.
+
 ## 0.19.5 (2021-11-10)
 
 ### Bug fixes

package/dist/index.cjs

@@ -265,7 +265,9 @@ class ChangeSet extends ChangeDesc {
     map(other, before = false) { return other.empty ? this : mapSet(this, other, before, true); }
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.
@@ -683,7 +685,14 @@ class SelectionRange {
     updated document.
     */
     map(change, assoc = -1) {
-        let from = change.mapPos(this.from, assoc), to = change.mapPos(this.to, assoc);
+        let from, to;
+        if (this.empty) {
+            from = to = change.mapPos(this.from, assoc);
+        }
+        else {
+            from = change.mapPos(this.from, 1);
+            to = change.mapPos(this.to, -1);
+        }
         return from == this.from && to == this.to ? this : new SelectionRange(from, to, this.flags);
     }
     /**
@@ -835,7 +844,8 @@ class EditorSelection {
     */
     static range(anchor, head, goalColumn) {
         let goal = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */;
-        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal) : new SelectionRange(anchor, head, goal);
+        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
+            : new SelectionRange(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
     }
 }
 function normalized(ranges, mainIndex = 0) {
@@ -956,7 +966,7 @@ class FacetProvider {
         var _a;
         let getter = this.value;
         let compare = this.facet.compareInput;
-        let idx = addresses[this.id] >> 1, multi = this.type == 2 /* Multi */;
+        let id = this.id, idx = addresses[id] >> 1, multi = this.type == 2 /* Multi */;
         let depDoc = false, depSel = false, depAddrs = [];
         for (let dep of this.dependencies) {
             if (dep == "doc")
@@ -966,24 +976,35 @@ class FacetProvider {
             else if ((((_a = addresses[dep.id]) !== null && _a !== void 0 ? _a : 1) & 1) == 0)
                 depAddrs.push(addresses[dep.id]);
         }
-        return (state, tr) => {
-            let oldVal = state.values[idx];
-            if (oldVal === Uninitialized) {
+        return {
+            create(state) {
                 state.values[idx] = getter(state);
                 return 1 /* Changed */;
-            }
-            if (tr) {
-                let depChanged = (depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) ||
-                    depAddrs.some(addr => (ensureAddr(state, addr) & 1 /* Changed */) > 0);
-                if (depChanged) {
+            },
+            update(state, tr) {
+                if ((depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) ||
+                    depAddrs.some(addr => (ensureAddr(state, addr) & 1 /* Changed */) > 0)) {
                     let newVal = getter(state);
-                    if (multi ? !compareArray(newVal, oldVal, compare) : !compare(newVal, oldVal)) {
+                    if (multi ? !compareArray(newVal, state.values[idx], compare) : !compare(newVal, state.values[idx])) {
                         state.values[idx] = newVal;
                         return 1 /* Changed */;
                     }
                 }
+                return 0;
+            },
+            reconfigure(state, oldState) {
+                let newVal = getter(state);
+                let oldAddr = oldState.config.address[id];
+                if (oldAddr != null) {
+                    let oldVal = getAddr(oldState, oldAddr);
+                    if (multi ? compareArray(newVal, oldVal, compare) : compare(newVal, oldVal)) {
+                        state.values[idx] = oldVal;
+                        return 0;
+                    }
+                }
+                state.values[idx] = newVal;
+                return 1 /* Changed */;
             }
-            return 0;
         };
     }
 }
@@ -1000,14 +1021,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
     let providerTypes = providers.map(p => p.type);
     let dynamic = providerAddrs.filter(p => !(p & 1));
     let idx = addresses[facet.id] >> 1;
-    return (state, tr) => {
-        let oldVal = state.values[idx], changed = oldVal === Uninitialized || !tr;
-        for (let dynAddr of dynamic) {
-            if (ensureAddr(state, dynAddr) & 1 /* Changed */)
-                changed = true;
-        }
-        if (!changed)
-            return 0;
+    function get(state) {
         let values = [];
         for (let i = 0; i < providerAddrs.length; i++) {
             let value = getAddr(state, providerAddrs[i]);
@@ -1017,11 +1031,39 @@ function dynamicFacetSlot(addresses, facet, providers) {
             else
                 values.push(value);
         }
-        let value = facet.combine(values);
-        if (facet.compare(value, oldVal))
-            return 0;
-        state.values[idx] = value;
-        return 1 /* Changed */;
+        return facet.combine(values);
+    }
+    return {
+        create(state) {
+            for (let addr of providerAddrs)
+                ensureAddr(state, addr);
+            state.values[idx] = get(state);
+            return 1 /* Changed */;
+        },
+        update(state, tr) {
+            if (!dynamic.some(dynAddr => ensureAddr(state, dynAddr) & 1 /* Changed */))
+                return 0;
+            let value = get(state);
+            if (facet.compare(value, state.values[idx]))
+                return 0;
+            state.values[idx] = value;
+            return 1 /* Changed */;
+        },
+        reconfigure(state, oldState) {
+            let depChanged = providerAddrs.some(addr => ensureAddr(state, addr) & 1 /* Changed */);
+            let oldProviders = oldState.config.facets[facet.id], oldValue = oldState.facet(facet);
+            if (oldProviders && !depChanged && sameArray(providers, oldProviders)) {
+                state.values[idx] = oldValue;
+                return 0;
+            }
+            let value = get(state);
+            if (facet.compare(value, oldValue)) {
+                state.values[idx] = oldValue;
+                return 0;
+            }
+            state.values[idx] = value;
+            return 1 /* Changed */;
+        }
     };
 }
 const initField = Facet.define({ static: true });
@@ -1067,20 +1109,27 @@ class StateField {
     */
     slot(addresses) {
         let idx = addresses[this.id] >> 1;
-        return (state, tr) => {
-            let oldVal = state.values[idx];
-            if (oldVal === Uninitialized) {
+        return {
+            create: (state) => {
                 state.values[idx] = this.create(state);
                 return 1 /* Changed */;
-            }
-            if (tr) {
+            },
+            update: (state, tr) => {
+                let oldVal = state.values[idx];
                 let value = this.updateF(oldVal, tr);
-                if (!this.compareF(oldVal, value)) {
-                    state.values[idx] = value;
-                    return 1 /* Changed */;
+                if (this.compareF(oldVal, value))
+                    return 0;
+                state.values[idx] = value;
+                return 1 /* Changed */;
+            },
+            reconfigure: (state, oldState) => {
+                if (oldState.config.address[this.id] != null) {
+                    state.values[idx] = oldState.field(this);
+                    return 0;
                 }
+                state.values[idx] = this.create(state);
+                return 1 /* Changed */;
             }
-            return 0;
         };
     }
     /**
@@ -1192,12 +1241,13 @@ class CompartmentInstance {
     }
 }
 class Configuration {
-    constructor(base, compartments, dynamicSlots, address, staticValues) {
+    constructor(base, compartments, dynamicSlots, address, staticValues, facets) {
         this.base = base;
         this.compartments = compartments;
         this.dynamicSlots = dynamicSlots;
         this.address = address;
         this.staticValues = staticValues;
+        this.facets = facets;
         this.statusTemplate = [];
         while (this.statusTemplate.length < dynamicSlots.length)
             this.statusTemplate.push(0 /* Unresolved */);
@@ -1223,18 +1273,19 @@ class Configuration {
             address[field.id] = dynamicSlots.length << 1;
             dynamicSlots.push(a => field.slot(a));
         }
+        let oldFacets = oldState === null || oldState === void 0 ? void 0 : oldState.config.facets;
         for (let id in facets) {
             let providers = facets[id], facet = providers[0].facet;
+            let oldProviders = oldFacets && oldFacets[id] || [];
             if (providers.every(p => p.type == 0 /* Static */)) {
                 address[facet.id] = (staticValues.length << 1) | 1;
-                let value = facet.combine(providers.map(p => p.value));
-                let oldAddr = oldState ? oldState.config.address[facet.id] : null;
-                if (oldAddr != null) {
-                    let oldVal = getAddr(oldState, oldAddr);
-                    if (facet.compare(value, oldVal))
-                        value = oldVal;
+                if (sameArray(oldProviders, providers)) {
+                    staticValues.push(oldState.facet(facet));
+                }
+                else {
+                    let value = facet.combine(providers.map(p => p.value));
+                    staticValues.push(oldState && facet.compare(value, oldState.facet(facet)) ? oldState.facet(facet) : value);
                 }
-                staticValues.push(value);
             }
             else {
                 for (let p of providers) {
@@ -1251,7 +1302,8 @@ class Configuration {
                 dynamicSlots.push(a => dynamicFacetSlot(a, facet, providers));
             }
         }
-        return new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues);
+        let dynamic = dynamicSlots.map(f => f(address));
+        return new Configuration(base, newCompartments, dynamic, address, staticValues, facets);
     }
 }
 function flatten(extension, compartments, newCompartments) {
@@ -1303,7 +1355,6 @@ function flatten(extension, compartments, newCompartments) {
     inner(extension, Prec_.default);
     return result.reduce((a, b) => a.concat(b));
 }
-const Uninitialized = {};
 function ensureAddr(state, addr) {
     if (addr & 1)
         return 2 /* Computed */;
@@ -1314,7 +1365,7 @@ function ensureAddr(state, addr) {
     if (status & 2 /* Computed */)
         return status;
     state.status[idx] = 4 /* Computing */;
-    let changed = state.config.dynamicSlots[idx](state, state.applying);
+    let changed = state.computeSlot(state, state.config.dynamicSlots[idx]);
     return state.status[idx] = 2 /* Computed */ | changed;
 }
 function getAddr(state, addr) {
@@ -1833,24 +1884,20 @@ class EditorState {
     /**
     @internal
     */
-    values, tr = null) {
+    values, computeSlot, tr) {
         this.config = config;
         this.doc = doc;
         this.selection = selection;
         this.values = values;
-        /**
-        @internal
-        */
-        this.applying = null;
         this.status = config.statusTemplate.slice();
-        this.applying = tr;
+        this.computeSlot = computeSlot;
         // Fill in the computed state immediately, so that further queries
         // for it made during the update return this state
         if (tr)
             tr._state = this;
         for (let i = 0; i < this.config.dynamicSlots.length; i++)
             ensureAddr(this, i << 1);
-        this.applying = null;
+        this.computeSlot = null;
     }
     field(field, require = true) {
         let addr = this.config.address[field.id];
@@ -1906,20 +1953,13 @@ class EditorState {
         let startValues;
         if (!conf) {
             conf = Configuration.resolve(base, compartments, this);
-            let updatedValues = conf.dynamicSlots.map(_ => Uninitialized);
-            // Copy over old values for shared facets/fields
-            for (let id in conf.address) {
-                let cur = conf.address[id], prev = this.config.address[id];
-                if (prev != null && (cur & 1) == 0)
-                    updatedValues[cur >> 1] = getAddr(this, prev);
-            }
-            let intermediateState = new EditorState(conf, this.doc, this.selection, updatedValues, null);
+            let intermediateState = new EditorState(conf, this.doc, this.selection, conf.dynamicSlots.map(() => null), (state, slot) => slot.reconfigure(state, this), null);
             startValues = intermediateState.values;
         }
         else {
             startValues = tr.startState.values.slice();
         }
-        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, tr);
+        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, (state, slot) => slot.update(state, tr), tr);
     }
     /**
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that
@@ -2052,7 +2092,7 @@ class EditorState {
         checkSelection(selection, doc.length);
         if (!configuration.staticFacet(allowMultipleSelections))
             selection = selection.asSingle();
-        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(_ => Uninitialized));
+        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(() => null), (state, slot) => slot.create(state), null);
     }
     /**
     The size (in columns) of a tab in the document, determined by
@@ -2265,9 +2305,7 @@ combine = {}) {
 
 Object.defineProperty(exports, 'Text', {
     enumerable: true,
-    get: function () {
-        return text.Text;
-    }
+    get: function () { return text.Text; }
 });
 exports.Annotation = Annotation;
 exports.AnnotationType = AnnotationType;

package/dist/index.d.ts

@@ -163,7 +163,9 @@ declare class ChangeSet extends ChangeDesc {
     map(other: ChangeDesc, before?: boolean): ChangeSet;
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.

package/dist/index.js

@@ -261,7 +261,9 @@ class ChangeSet extends ChangeDesc {
     map(other, before = false) { return other.empty ? this : mapSet(this, other, before, true); }
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.
@@ -679,7 +681,14 @@ class SelectionRange {
     updated document.
     */
     map(change, assoc = -1) {
-        let from = change.mapPos(this.from, assoc), to = change.mapPos(this.to, assoc);
+        let from, to;
+        if (this.empty) {
+            from = to = change.mapPos(this.from, assoc);
+        }
+        else {
+            from = change.mapPos(this.from, 1);
+            to = change.mapPos(this.to, -1);
+        }
         return from == this.from && to == this.to ? this : new SelectionRange(from, to, this.flags);
     }
     /**
@@ -831,7 +840,8 @@ class EditorSelection {
     */
     static range(anchor, head, goalColumn) {
         let goal = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */;
-        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal) : new SelectionRange(anchor, head, goal);
+        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
+            : new SelectionRange(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
     }
 }
 function normalized(ranges, mainIndex = 0) {
@@ -952,7 +962,7 @@ class FacetProvider {
         var _a;
         let getter = this.value;
         let compare = this.facet.compareInput;
-        let idx = addresses[this.id] >> 1, multi = this.type == 2 /* Multi */;
+        let id = this.id, idx = addresses[id] >> 1, multi = this.type == 2 /* Multi */;
         let depDoc = false, depSel = false, depAddrs = [];
         for (let dep of this.dependencies) {
             if (dep == "doc")
@@ -962,24 +972,35 @@ class FacetProvider {
             else if ((((_a = addresses[dep.id]) !== null && _a !== void 0 ? _a : 1) & 1) == 0)
                 depAddrs.push(addresses[dep.id]);
         }
-        return (state, tr) => {
-            let oldVal = state.values[idx];
-            if (oldVal === Uninitialized) {
+        return {
+            create(state) {
                 state.values[idx] = getter(state);
                 return 1 /* Changed */;
-            }
-            if (tr) {
-                let depChanged = (depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) ||
-                    depAddrs.some(addr => (ensureAddr(state, addr) & 1 /* Changed */) > 0);
-                if (depChanged) {
+            },
+            update(state, tr) {
+                if ((depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) ||
+                    depAddrs.some(addr => (ensureAddr(state, addr) & 1 /* Changed */) > 0)) {
                     let newVal = getter(state);
-                    if (multi ? !compareArray(newVal, oldVal, compare) : !compare(newVal, oldVal)) {
+                    if (multi ? !compareArray(newVal, state.values[idx], compare) : !compare(newVal, state.values[idx])) {
                         state.values[idx] = newVal;
                         return 1 /* Changed */;
                     }
                 }
+                return 0;
+            },
+            reconfigure(state, oldState) {
+                let newVal = getter(state);
+                let oldAddr = oldState.config.address[id];
+                if (oldAddr != null) {
+                    let oldVal = getAddr(oldState, oldAddr);
+                    if (multi ? compareArray(newVal, oldVal, compare) : compare(newVal, oldVal)) {
+                        state.values[idx] = oldVal;
+                        return 0;
+                    }
+                }
+                state.values[idx] = newVal;
+                return 1 /* Changed */;
             }
-            return 0;
         };
     }
 }
@@ -996,14 +1017,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
     let providerTypes = providers.map(p => p.type);
     let dynamic = providerAddrs.filter(p => !(p & 1));
     let idx = addresses[facet.id] >> 1;
-    return (state, tr) => {
-        let oldVal = state.values[idx], changed = oldVal === Uninitialized || !tr;
-        for (let dynAddr of dynamic) {
-            if (ensureAddr(state, dynAddr) & 1 /* Changed */)
-                changed = true;
-        }
-        if (!changed)
-            return 0;
+    function get(state) {
         let values = [];
         for (let i = 0; i < providerAddrs.length; i++) {
             let value = getAddr(state, providerAddrs[i]);
@@ -1013,11 +1027,39 @@ function dynamicFacetSlot(addresses, facet, providers) {
             else
                 values.push(value);
         }
-        let value = facet.combine(values);
-        if (facet.compare(value, oldVal))
-            return 0;
-        state.values[idx] = value;
-        return 1 /* Changed */;
+        return facet.combine(values);
+    }
+    return {
+        create(state) {
+            for (let addr of providerAddrs)
+                ensureAddr(state, addr);
+            state.values[idx] = get(state);
+            return 1 /* Changed */;
+        },
+        update(state, tr) {
+            if (!dynamic.some(dynAddr => ensureAddr(state, dynAddr) & 1 /* Changed */))
+                return 0;
+            let value = get(state);
+            if (facet.compare(value, state.values[idx]))
+                return 0;
+            state.values[idx] = value;
+            return 1 /* Changed */;
+        },
+        reconfigure(state, oldState) {
+            let depChanged = providerAddrs.some(addr => ensureAddr(state, addr) & 1 /* Changed */);
+            let oldProviders = oldState.config.facets[facet.id], oldValue = oldState.facet(facet);
+            if (oldProviders && !depChanged && sameArray(providers, oldProviders)) {
+                state.values[idx] = oldValue;
+                return 0;
+            }
+            let value = get(state);
+            if (facet.compare(value, oldValue)) {
+                state.values[idx] = oldValue;
+                return 0;
+            }
+            state.values[idx] = value;
+            return 1 /* Changed */;
+        }
     };
 }
 const initField = /*@__PURE__*/Facet.define({ static: true });
@@ -1063,20 +1105,27 @@ class StateField {
     */
     slot(addresses) {
         let idx = addresses[this.id] >> 1;
-        return (state, tr) => {
-            let oldVal = state.values[idx];
-            if (oldVal === Uninitialized) {
+        return {
+            create: (state) => {
                 state.values[idx] = this.create(state);
                 return 1 /* Changed */;
-            }
-            if (tr) {
+            },
+            update: (state, tr) => {
+                let oldVal = state.values[idx];
                 let value = this.updateF(oldVal, tr);
-                if (!this.compareF(oldVal, value)) {
-                    state.values[idx] = value;
-                    return 1 /* Changed */;
+                if (this.compareF(oldVal, value))
+                    return 0;
+                state.values[idx] = value;
+                return 1 /* Changed */;
+            },
+            reconfigure: (state, oldState) => {
+                if (oldState.config.address[this.id] != null) {
+                    state.values[idx] = oldState.field(this);
+                    return 0;
                 }
+                state.values[idx] = this.create(state);
+                return 1 /* Changed */;
             }
-            return 0;
         };
     }
     /**
@@ -1188,12 +1237,13 @@ class CompartmentInstance {
     }
 }
 class Configuration {
-    constructor(base, compartments, dynamicSlots, address, staticValues) {
+    constructor(base, compartments, dynamicSlots, address, staticValues, facets) {
         this.base = base;
         this.compartments = compartments;
         this.dynamicSlots = dynamicSlots;
         this.address = address;
         this.staticValues = staticValues;
+        this.facets = facets;
         this.statusTemplate = [];
         while (this.statusTemplate.length < dynamicSlots.length)
             this.statusTemplate.push(0 /* Unresolved */);
@@ -1219,18 +1269,19 @@ class Configuration {
             address[field.id] = dynamicSlots.length << 1;
             dynamicSlots.push(a => field.slot(a));
         }
+        let oldFacets = oldState === null || oldState === void 0 ? void 0 : oldState.config.facets;
         for (let id in facets) {
             let providers = facets[id], facet = providers[0].facet;
+            let oldProviders = oldFacets && oldFacets[id] || [];
             if (providers.every(p => p.type == 0 /* Static */)) {
                 address[facet.id] = (staticValues.length << 1) | 1;
-                let value = facet.combine(providers.map(p => p.value));
-                let oldAddr = oldState ? oldState.config.address[facet.id] : null;
-                if (oldAddr != null) {
-                    let oldVal = getAddr(oldState, oldAddr);
-                    if (facet.compare(value, oldVal))
-                        value = oldVal;
+                if (sameArray(oldProviders, providers)) {
+                    staticValues.push(oldState.facet(facet));
+                }
+                else {
+                    let value = facet.combine(providers.map(p => p.value));
+                    staticValues.push(oldState && facet.compare(value, oldState.facet(facet)) ? oldState.facet(facet) : value);
                 }
-                staticValues.push(value);
             }
             else {
                 for (let p of providers) {
@@ -1247,7 +1298,8 @@ class Configuration {
                 dynamicSlots.push(a => dynamicFacetSlot(a, facet, providers));
             }
         }
-        return new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues);
+        let dynamic = dynamicSlots.map(f => f(address));
+        return new Configuration(base, newCompartments, dynamic, address, staticValues, facets);
     }
 }
 function flatten(extension, compartments, newCompartments) {
@@ -1299,7 +1351,6 @@ function flatten(extension, compartments, newCompartments) {
     inner(extension, Prec_.default);
     return result.reduce((a, b) => a.concat(b));
 }
-const Uninitialized = {};
 function ensureAddr(state, addr) {
     if (addr & 1)
         return 2 /* Computed */;
@@ -1310,7 +1361,7 @@ function ensureAddr(state, addr) {
     if (status & 2 /* Computed */)
         return status;
     state.status[idx] = 4 /* Computing */;
-    let changed = state.config.dynamicSlots[idx](state, state.applying);
+    let changed = state.computeSlot(state, state.config.dynamicSlots[idx]);
     return state.status[idx] = 2 /* Computed */ | changed;
 }
 function getAddr(state, addr) {
@@ -1828,24 +1879,20 @@ class EditorState {
     /**
     @internal
     */
-    values, tr = null) {
+    values, computeSlot, tr) {
         this.config = config;
         this.doc = doc;
         this.selection = selection;
         this.values = values;
-        /**
-        @internal
-        */
-        this.applying = null;
         this.status = config.statusTemplate.slice();
-        this.applying = tr;
+        this.computeSlot = computeSlot;
         // Fill in the computed state immediately, so that further queries
         // for it made during the update return this state
         if (tr)
             tr._state = this;
         for (let i = 0; i < this.config.dynamicSlots.length; i++)
             ensureAddr(this, i << 1);
-        this.applying = null;
+        this.computeSlot = null;
     }
     field(field, require = true) {
         let addr = this.config.address[field.id];
@@ -1901,20 +1948,13 @@ class EditorState {
         let startValues;
         if (!conf) {
             conf = Configuration.resolve(base, compartments, this);
-            let updatedValues = conf.dynamicSlots.map(_ => Uninitialized);
-            // Copy over old values for shared facets/fields
-            for (let id in conf.address) {
-                let cur = conf.address[id], prev = this.config.address[id];
-                if (prev != null && (cur & 1) == 0)
-                    updatedValues[cur >> 1] = getAddr(this, prev);
-            }
-            let intermediateState = new EditorState(conf, this.doc, this.selection, updatedValues, null);
+            let intermediateState = new EditorState(conf, this.doc, this.selection, conf.dynamicSlots.map(() => null), (state, slot) => slot.reconfigure(state, this), null);
             startValues = intermediateState.values;
         }
         else {
             startValues = tr.startState.values.slice();
         }
-        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, tr);
+        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, (state, slot) => slot.update(state, tr), tr);
     }
     /**
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that
@@ -2047,7 +2087,7 @@ class EditorState {
         checkSelection(selection, doc.length);
         if (!configuration.staticFacet(allowMultipleSelections))
             selection = selection.asSingle();
-        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(_ => Uninitialized));
+        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(() => null), (state, slot) => slot.create(state), null);
     }
     /**
     The size (in columns) of a tab in the document, determined by

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/state",
-  "version": "0.19.5",
+  "version": "0.19.9",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",