@portone/docx-editor 0.6.0 → 0.6.1

package/dist/editor/stories/storyView.js

@@ -0,0 +1,144 @@
+// src/editor/stories/storyView.ts
+import {
+  TextSelection
+} from "prosemirror-state";
+import { EditorView } from "prosemirror-view";
+import { editingProtection, editsShut } from "../../schema/protectionState.js";
+import { sameStory, storyNodeOf } from "../../schema/stories.js";
+import { editorClassNames } from "../../styles/classNames.js";
+import { runMarkView } from "../views/runMarkView.js";
+import { storyEditorState } from "./storyState.js";
+var SURFACE_CAPABILITIES = [
+  "list",
+  "table",
+  "image",
+  "link",
+  "note",
+  "comment"
+];
+var EVERY_CAPABILITY = new Set(
+  SURFACE_CAPABILITIES
+);
+var NO_CAPABILITY = /* @__PURE__ */ new Set();
+function caretOf(state) {
+  return {
+    kind: "at",
+    anchor: state.selection.anchor,
+    head: state.selection.head
+  };
+}
+function placed(state, at, to) {
+  const size = state.doc.content.size;
+  const $anchor = state.doc.resolve(Math.min(Math.max(at, 0), size));
+  const $head = state.doc.resolve(Math.min(Math.max(to, 0), size));
+  return state.apply(
+    state.tr.setSelection(TextSelection.between($anchor, $head))
+  );
+}
+function endComposition(view) {
+  if (!view.composing) return;
+  const marks = view.state.storedMarks ?? view.state.selection.$from.marks();
+  view.dispatch(
+    view.state.tr.setStoredMarks(marks).setMeta("addToHistory", false)
+  );
+}
+function createStoryView({
+  mount,
+  host,
+  key,
+  document,
+  fontFallbacks,
+  extensions,
+  caret = null,
+  onStateChange
+}) {
+  const standing = () => host.shut(key) ? "readOnly" : editingProtection(host.state());
+  let protection = standing();
+  const keys = {
+    "Mod-z": () => host.undo(),
+    "Mod-y": () => host.redo(),
+    "Shift-Mod-z": () => host.redo(),
+    Escape: () => {
+      host.leave(key);
+      return true;
+    }
+  };
+  const built = (story) => storyEditorState({
+    story,
+    document,
+    protection,
+    keys,
+    plugins: extensions.plugins,
+    normalizers: extensions.normalizers,
+    takes: extensions.takes
+  });
+  const storyNow = () => storyNodeOf(host.state().doc, key);
+  const opening = storyNow();
+  if (opening === null) {
+    throw new Error(`the document holds no story named ${key}`);
+  }
+  const view = new EditorView(mount, {
+    state: built(opening),
+    // A standing that shuts the story shuts typing in it, and is read off the state so that a
+    // mode switched while the story is open takes effect without a new view
+    editable: (current) => !editsShut(current),
+    attributes: { class: editorClassNames.storyBody },
+    // The schema can only draw a run with the default fallbacks; this view draws the host's
+    markViews: { run: runMarkView(fontFallbacks) },
+    nodeViews: extensions.nodeViews,
+    dispatchTransaction(transaction) {
+      const next = view.state.applyTransaction(transaction);
+      if (next.state.doc === view.state.doc) {
+        show(next.state);
+        return;
+      }
+      const before = view.state;
+      show(next.state);
+      if (host.write(key, next.state.doc)) return;
+      if (sameStory(storyNow(), next.state.doc)) return;
+      show(before);
+      endComposition(view);
+    }
+  });
+  const show = (next) => {
+    view.updateState(next);
+    onStateChange?.(next);
+  };
+  const open = caret ?? null;
+  if (open === null) {
+    const end = view.state.doc.content.size;
+    show(placed(view.state, end, end));
+  } else if (open.kind === "at") {
+    show(placed(view.state, open.anchor, open.head));
+  } else {
+    const at = view.posAtCoords({ left: open.left, top: open.top });
+    const pos = at?.pos ?? view.state.doc.content.size;
+    show(placed(view.state, pos, pos));
+  }
+  const registerFocus = () => host.activate(key, view);
+  view.dom.addEventListener("focus", registerFocus);
+  return {
+    view,
+    sync() {
+      const story = storyNow();
+      if (story === null) return;
+      const wanted = standing();
+      if (wanted === protection && sameStory(story, view.state.doc)) return;
+      const { anchor, head } = view.state.selection;
+      protection = wanted;
+      show(placed(built(story), anchor, head));
+    },
+    destroy() {
+      view.dom.removeEventListener("focus", registerFocus);
+      host.activate(key, null);
+      view.destroy();
+    }
+  };
+}
+export {
+  EVERY_CAPABILITY,
+  NO_CAPABILITY,
+  SURFACE_CAPABILITIES,
+  caretOf,
+  createStoryView
+};

package/dist/numbering/spellers.d.ts

@@ -6,7 +6,7 @@
  * because it has a speller here, so a marker can never be counted in a format nothing can write.
  */
 /** A `w:numFmt` this editor spells out. Every other one is drawn as a decimal */
-export type NumberFormat = "decimal" | "decimalZero" | "bullet" | "lowerLetter" | "upperLetter" | "lowerRoman" | "upperRoman" | "ganada" | "koreanDigital" | "chineseCounting";
+export type NumberFormat = "decimal" | "decimalZero" | "bullet" | "lowerLetter" | "upperLetter" | "lowerRoman" | "upperRoman" | "ganada" | "koreanDigital" | "chineseCounting" | "chicago";
 export declare function isNumberFormat(value: string | null): value is NumberFormat;
 /**
  * The count as this format writes it, and as a decimal where spelling it out would run past the

package/dist/numbering/spellers.js

@@ -31,6 +31,7 @@ function repeated(symbols, count) {
   return (symbols[index] ?? "").repeat(times);
 }
 var LATIN = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+var CHICAGO = "*\u2020\u2021\xA7";
 var GANADA = "\uAC00\uB098\uB2E4\uB77C\uB9C8\uBC14\uC0AC\uC544\uC790\uCC28\uCE74\uD0C0\uD30C\uD558";
 var KOREAN_DIGITS = "\uC601\uC77C\uC774\uC0BC\uC0AC\uC624\uC721\uCE60\uD314\uAD6C";
 function digits(symbols, count) {
@@ -80,7 +81,11 @@ var NUMBER_SPELLERS = {
     spell: (count) => digits(KOREAN_DIGITS, count),
     countsPerChar: POSITIONAL
   },
-  chineseCounting: { spell: chineseCounting, countsPerChar: POSITIONAL }
+  chineseCounting: { spell: chineseCounting, countsPerChar: POSITIONAL },
+  chicago: {
+    spell: (count) => repeated(CHICAGO, count),
+    countsPerChar: CHICAGO.length
+  }
 };
 function isNumberFormat(value) {
   return value !== null && Object.hasOwn(NUMBER_SPELLERS, value);

package/dist/page/blockKinds.d.ts

@@ -10,6 +10,7 @@
  */
 import type { Node as PMNode } from "prosemirror-model";
 import type { Decoration, EditorView } from "prosemirror-view";
+import type { PageDemand } from "./demands";
 /** A place inside a block where the next page may, or must, start */
 export interface BreakCandidate {
     /**
@@ -41,13 +42,21 @@ export interface MeasuredBlock {
     minFirstPiece: number;
     /** The document asks for this block to stand on the same page as the start of the block after it */
     keepWithNext: boolean;
+    /**
+     * The places in the block that ask the page they land on for room at its foot, their offsets read
+     * like a candidate's with no space in the block. A block asking for none may leave it out
+     */
+    demands?: readonly PageDemand[];
 }
 /** A page cut the layout decided on: the space opened before the continued piece */
 export interface PageCut {
     at: number;
     height: number;
 }
-/** One block as it stands on the sheet, handed to the kind about to measure it */
+/**
+ * One block as it stands on the sheet, handed to the kind about to measure it and then to every
+ * demand source (`page/demands`)
+ */
 export interface MeasureTarget {
     view: EditorView;
     node: PMNode;
@@ -72,6 +81,15 @@ export interface KindMeasure {
     breakAfter: boolean;
     /** Height the engine's own marks add inside this block, taken off its measured bottom */
     appliedHeight: number;
+    /**
+     * What the engine's marks have opened at each place this block was cut, as the browser drew it,
+     * by the candidate's position. What is drawn there can come out taller than the cut asked for -
+     * a table's spacer row takes half of a collapsed border on each side - and everything else a
+     * kind reports is read off the sheet as drawn, so a place below a cut is taken back to its
+     * natural offset by this rather than by what the layout asked for (`page/measureBlocks`).
+     * A kind that opens nothing leaves it out
+     */
+    opened?: ReadonlyMap<number, number>;
     /**
      * Whether the document asks for this block to stand on the same page as the start of the block
      * after it. A kind whose blocks never do leaves it out
@@ -82,9 +100,10 @@ export interface KindMeasure {
  * Everything the engine does with one shape of breakable block: how one is measured, and how the
  * cuts the layout gave it are drawn.
  *
- * A shape the engine learns later - a footnote area, a paragraph with a floating object hanging
- * out of it - is one more kind rather than another branch in the measurer, in the decorations
- * and in the plugin state at once.
+ * A shape the engine learns later is one more kind rather than another branch in the measurer, in
+ * the decorations and in the plugin state at once. Room a place inside a block asks of the page it
+ * lands on is not a shape: a block has one kind while such a place can stand inside a block of any
+ * kind, so it is asked of every block by a demand source (`page/demands`) instead.
  */
 export interface BlockKind {
     readonly name: string;

package/dist/page/demands/footnoteDemands.d.ts

@@ -0,0 +1,18 @@
+/**
+ * The room a footnote reference asks of the page it lands on: its footnote, drawn at the foot of
+ * that page (`ui/notes`).
+ *
+ * The sheet is measured on every layout pass and nearly every block holds no reference, so which
+ * references a block holds is read off the block node and remembered against it. A node an edit
+ * did not touch is the same node afterwards, so a pass reads nothing off the page for a block with
+ * no reference and walks only the blocks an edit rebuilt.
+ */
+import type { DemandSource } from "./index";
+/** The band footnotes are kept in, which the layout's caller hands the heights of */
+export declare const FOOTNOTE_BAND = "footnote";
+/**
+ * Where footnotes stand among the bands a page keeps (`DemandBand.order`). Word sets them at the
+ * very foot of the body, under anything else the page holds there, so this is the last place
+ */
+export declare const FOOTNOTE_BAND_ORDER = 0;
+export declare const footnoteDemands: DemandSource;

package/dist/page/demands/footnoteDemands.js

@@ -0,0 +1,51 @@
+// src/page/demands/footnoteDemands.ts
+import { docxSchema } from "../../schema/index.js";
+import { storyKey } from "../../schema/stories.js";
+var FOOTNOTE_BAND = "footnote";
+var FOOTNOTE_BAND_ORDER = 0;
+var BAND_NOTE_KINDS = ["footnote"];
+var NO_REFERENCES = [];
+var NO_DEMANDS = [];
+var held = /* @__PURE__ */ new WeakMap();
+function footnoteReferencesIn(block) {
+  const remembered = held.get(block);
+  if (remembered) return remembered;
+  const found = [];
+  block.descendants((node, offset) => {
+    if (node.type !== docxSchema.nodes.noteReference) return true;
+    const id = node.attrs.id;
+    const kind = BAND_NOTE_KINDS.find(
+      (candidate) => candidate === node.attrs.kind
+    );
+    if (kind !== void 0 && typeof id === "string") {
+      found.push({ offset, key: storyKey(kind, id) });
+    }
+    return false;
+  });
+  const references = found.length === 0 ? NO_REFERENCES : found;
+  held.set(block, references);
+  return references;
+}
+var footnoteDemands = {
+  name: "footnote",
+  demandsIn({ view, node, pos, sheetY, top }) {
+    const references = footnoteReferencesIn(node);
+    if (references.length === 0) return NO_DEMANDS;
+    return references.flatMap(({ offset, key }) => {
+      const drawn = view.nodeDOM(pos + 1 + offset);
+      if (!(drawn instanceof Element)) return [];
+      return [
+        {
+          offset: sheetY(drawn.getBoundingClientRect().top) - top,
+          id: key,
+          band: FOOTNOTE_BAND
+        }
+      ];
+    });
+  }
+};
+export {
+  FOOTNOTE_BAND,
+  FOOTNOTE_BAND_ORDER,
+  footnoteDemands
+};

package/dist/page/demands/index.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Room a place inside a block asks the page it lands on to keep at the foot of its body.
+ *
+ * A block has one kind (`page/blockKinds`), and a place asking for room can stand inside a block of
+ * any kind: a paragraph, or a paragraph in a table cell. So what asks is not a kind but a source,
+ * and every registered source is asked about every block whatever its kind. The layout
+ * (`page/pageLayout`) knows a demand by its band alone, never by what put it there.
+ */
+import type { MeasureTarget } from "../blockKinds";
+/** Room one place in a block asks the page it lands on to keep at the foot */
+export interface PageDemand {
+    /**
+     * The place's top from the block's natural top. A source reads it off the sheet as drawn, the
+     * way a kind reads a candidate (`target.sheetY(viewportY) - target.top`), and the measurement
+     * takes back off the spaces the engine opened inside the block above that place
+     * (`page/measureBlocks`), so no source has to know what any kind draws
+     */
+    readonly offset: number;
+    /** What is kept. One id is kept once on a page, however many places on it ask for it */
+    readonly id: string;
+    /** The band at the foot of the page that keeps it (`DemandBand`) */
+    readonly band: string;
+}
+export interface DemandSource {
+    readonly name: string;
+    demandsIn(target: MeasureTarget): readonly PageDemand[];
+}
+export interface DemandBand {
+    /**
+     * Where this band stands among the bands one page keeps, counted up from the foot of the body:
+     * 0 stands at the very foot and a higher number above it, between the text and the band below.
+     * Without it a page would stack its bands in the order its text happened to reach them, so the
+     * same two bands could come out one way round on one page and the other way round on the next.
+     * Two bands a page may hold together name two different places
+     */
+    readonly order: number;
+    /** Height a page adds once when it holds any demand of this band */
+    readonly overhead: number;
+    /** The height each id takes in the band. An id not measured yet takes none */
+    readonly heights: ReadonlyMap<string, number>;
+}
+/** The sources the editor asks about every block, in the order their demands are listed */
+export declare const DEFAULT_DEMAND_SOURCES: readonly DemandSource[];

package/dist/page/demands/index.js

@@ -0,0 +1,8 @@
+// src/page/demands/index.ts
+import { footnoteDemands } from "./footnoteDemands.js";
+var DEFAULT_DEMAND_SOURCES = [
+  footnoteDemands
+];
+export {
+  DEFAULT_DEMAND_SOURCES
+};

package/dist/page/kinds/paragraphKind.js

@@ -28,9 +28,11 @@ var paragraphKind = {
     const breaks = pageBreaksIn(node, pos);
     const candidates = [];
     let appliedHeight = 0;
+    const opened = /* @__PURE__ */ new Map();
     dom.querySelectorAll(BREAK_SPACE).forEach((space, index) => {
       const box = space.getBoundingClientRect();
       const found = breaks.at(index);
+      const drawn = box.height / scale;
       if (found) {
         candidates.push({
           at: found.at,
@@ -38,8 +40,9 @@ var paragraphKind = {
           forced: true,
           repeatHeight: 0
         });
+        if (drawn > 0) opened.set(found.at, drawn);
       }
-      appliedHeight += box.height / scale;
+      appliedHeight += drawn;
     });
     return {
       candidates,
@@ -48,6 +51,7 @@ var paragraphKind = {
       // still start a new page, but only after the whole block
       breakAfter: dom.querySelectorAll(PAGE_BREAK_BR).length > candidates.length,
       appliedHeight,
+      opened,
       keepWithNext: toParagraphFormat(node.attrs.format)?.keepNext === true
     };
   },
@@ -59,6 +63,8 @@ var paragraphKind = {
       into.push(
         Decoration.inline(at, at + size, {
           nodeName: "span",
+          // Chrome can enter the enlarged break and insert text outside the document model.
+          contenteditable: "false",
           style: spaceStyle(height),
           [editorAttributes.pageBreakSpace]: `${height}`
         })

package/dist/page/kinds/tableKind.js

@@ -34,7 +34,8 @@ function rowEntries(view, tableNode, tablePos, tableDom, appliedRows, scale) {
       node: row,
       pos,
       top: (rect.top - tableTop) / scale - appliedBefore,
-      height: rect.height / scale
+      height: rect.height / scale,
+      appliedAbove: appliedBefore
     });
   });
   return entries;
@@ -132,6 +133,12 @@ var tableKind = {
         });
       }
     }
+    const opened = /* @__PURE__ */ new Map();
+    rows.forEach((row, index) => {
+      const above = index === 0 ? 0 : rows[index - 1]?.appliedAbove ?? 0;
+      const here = row.appliedAbove - above;
+      if (here > 0) opened.set(row.pos, here);
+    });
     const firstBodyBoundary = candidates.find(
       (candidate) => candidate.offset > repeatHeaderHeight + 0.5
     );
@@ -141,6 +148,7 @@ var tableKind = {
     );
     return {
       candidates,
+      opened,
       // The smallest useful first piece: the headers followed by one body row group
       minFirstPiece: firstBodyBoundary?.offset ?? dom.getBoundingClientRect().height / scale - appliedHeight,
       // A space cannot be opened inside a cell, so a break standing in one is answered after the

package/dist/page/measureBlocks.d.ts

@@ -7,6 +7,8 @@
  * The engine's own marks are taken back off as they are read, so a block already pushed and a
  * break already given its space read as they would with neither applied. A measurement that read
  * them in would add to what is already there, and the layout would creep on every pass.
+ * Every demand source (`page/demands`) is asked about every block as well, after its kind, and the
+ * places it reads have the spaces the engine opened inside the block taken back off the same way.
  * Where there is no layout (in tests) everything is 0, so the result is a single page.
  */
 import type { EditorView } from "prosemirror-view";

package/dist/page/measureBlocks.js

@@ -1,15 +1,15 @@
 // src/page/measureBlocks.ts
 import { editorAttributes } from "../styles/classNames.js";
-import { blockKindFor } from "./blockKinds.js";
-import { blockKindsOf } from "./pageDecorations.js";
+import { visualScaleOf } from "../styles/visualScale.js";
+import {
+  blockKindFor
+} from "./blockKinds.js";
+import { blockKindsOf, demandSourcesOf } from "./pageDecorations.js";
+var NOTHING_OPENED = /* @__PURE__ */ new Map();
 function pixels(value) {
   const parsed = Number.parseFloat(value);
   return Number.isFinite(parsed) ? parsed : 0;
 }
-function visualScale(element) {
-  const scale = pixels(getComputedStyle(element).zoom);
-  return scale > 0 ? scale : 1;
-}
 function appliedPush(element) {
   return pixels(element.getAttribute(editorAttributes.pagePush) ?? "");
 }
@@ -23,16 +23,28 @@ function drawnBlocks(view) {
   });
   return found;
 }
+function naturalOffset(candidates, opened, drawn) {
+  let shift = 0;
+  for (const candidate of candidates) {
+    const space = opened.get(candidate.at);
+    if (space === void 0) continue;
+    const start = candidate.offset + shift;
+    if (drawn < start) break;
+    shift += Math.min(space, drawn - start);
+  }
+  return drawn - shift;
+}
 function measureSheet(view, layer) {
   const sheet = view.dom;
   const sheetRect = sheet.getBoundingClientRect();
   const layerRect = layer.getBoundingClientRect();
   const style = getComputedStyle(sheet);
-  const scale = visualScale(layer);
+  const scale = visualScaleOf(layer);
   const contentTop = pixels(style.paddingTop);
   const contentBottom = pixels(style.paddingBottom);
   const sheetY = (viewportY) => (viewportY - sheetRect.top) / scale;
   const kinds = blockKindsOf(view.state);
+  const sources = demandSourcesOf(view.state);
   const blocks = [];
   let previousBottom = contentTop;
   let applied = 0;
@@ -42,7 +54,7 @@ function measureSheet(view, layer) {
     const above = applied;
     const blockY = (viewportY) => sheetY(viewportY) - above;
     const top = blockY(rect.top);
-    const measured = blockKindFor(kinds, node).measure({
+    const target = {
       view,
       node,
       pos,
@@ -50,7 +62,8 @@ function measureSheet(view, layer) {
       sheetY: blockY,
       top,
       scale
-    });
+    };
+    const measured = blockKindFor(kinds, node).measure(target);
     applied += measured.appliedHeight;
     const bottom = sheetY(rect.bottom) - applied;
     blocks.push({
@@ -61,7 +74,15 @@ function measureSheet(view, layer) {
       breakAfter: measured.breakAfter,
       candidates: measured.candidates,
       minFirstPiece: measured.minFirstPiece,
-      keepWithNext: measured.keepWithNext ?? false
+      keepWithNext: measured.keepWithNext ?? false,
+      demands: sources.flatMap((source) => source.demandsIn(target)).map((demand) => ({
+        ...demand,
+        offset: naturalOffset(
+          measured.candidates,
+          measured.opened ?? NOTHING_OPENED,
+          demand.offset
+        )
+      }))
     });
     previousBottom = bottom;
   }

package/dist/page/pageDecorations.d.ts

@@ -3,13 +3,15 @@
  * own kind draws the cuts inside it as (`page/kinds`).
  *
  * The kinds the editor was built with are held here, so the measurement and the decorations read
- * one registry and a block is measured by the same kind that draws it.
+ * one registry and a block is measured by the same kind that draws it. The demand sources
+ * (`page/demands`) the measurement asks about every block are held beside them.
  * The document model is left untouched, so no trace of any of it is left in the exported XML or
  * in the edit history.
  */
 import { type EditorState, Plugin } from "prosemirror-state";
 import { DecorationSet, type EditorView } from "prosemirror-view";
 import { type BlockKind, type PageCut } from "./blockKinds";
+import { type DemandSource } from "./demands";
 import type { BlockPush } from "./pageLayout";
 /** Everything one measurement has to say about the page (`page/pageLayout`) */
 export interface PageMarksInput {
@@ -25,11 +27,16 @@ export interface PageMarksInput {
 }
 interface PageMarks extends PageMarksInput {
     kinds: readonly BlockKind[];
+    sources: readonly DemandSource[];
     decorations: DecorationSet;
 }
-export declare function pageDecorations(kinds?: readonly BlockKind[]): Plugin<PageMarks>;
+export declare function pageDecorations(kinds?: readonly BlockKind[], sources?: readonly DemandSource[]): Plugin<PageMarks>;
 /** The kinds the editor was built with, which the measurement reads to match them */
 export declare function blockKindsOf(state: EditorState): readonly BlockKind[];
+/** The demand sources the editor was built with, which the measurement asks about every block */
+export declare function demandSourcesOf(state: EditorState): readonly DemandSource[];
+/** The cuts the sheet is drawn with, whose spaces the measurement takes back off a demand's place */
+export declare function pageCutsOf(state: EditorState): readonly PageCut[];
 /** One transaction, or none when the same marks are already applied */
 export declare function setPageMarks(view: EditorView, next: PageMarksInput): void;
 export {};

package/dist/page/pageDecorations.js

@@ -6,6 +6,7 @@ import {
 import { Decoration, DecorationSet } from "prosemirror-view";
 import { editorAttributes } from "../styles/classNames.js";
 import { blockKindFor } from "./blockKinds.js";
+import { DEFAULT_DEMAND_SOURCES } from "./demands/index.js";
 import { DEFAULT_BLOCK_KINDS } from "./kinds/index.js";
 var marksKey = new PluginKey("docxPageDecorations");
 function pushStyle(marginTop) {
@@ -46,9 +47,10 @@ function decorationsFor(doc, kinds, pushes, cuts) {
   });
   return DecorationSet.create(doc, decorations);
 }
-function marksFor(doc, kinds, pushes, cuts) {
+function marksFor(doc, { kinds, sources }, pushes, cuts) {
   return {
     kinds,
+    sources,
     pushes,
     cuts,
     decorations: decorationsFor(doc, kinds, pushes, cuts)
@@ -75,18 +77,18 @@ function samePageMarks(a, b) {
     return other !== void 0 && other.at === cut.at && other.height === cut.height;
   });
 }
-function pageDecorations(kinds = DEFAULT_BLOCK_KINDS) {
+function pageDecorations(kinds = DEFAULT_BLOCK_KINDS, sources = DEFAULT_DEMAND_SOURCES) {
   return new Plugin({
     key: marksKey,
     state: {
-      init: (_config, state) => marksFor(state.doc, kinds, [], []),
+      init: (_config, state) => marksFor(state.doc, { kinds, sources }, [], []),
       apply(tr, value) {
         const next = tr.getMeta(marksKey);
         if (next) return next;
         if (!tr.docChanged) return value;
         return marksFor(
           tr.doc,
-          value.kinds,
+          value,
           value.pushes.map((push) => ({
             ...push,
             pos: tr.mapping.map(push.pos)
@@ -106,6 +108,12 @@ function pageDecorations(kinds = DEFAULT_BLOCK_KINDS) {
 function blockKindsOf(state) {
   return marksKey.getState(state)?.kinds ?? DEFAULT_BLOCK_KINDS;
 }
+function demandSourcesOf(state) {
+  return marksKey.getState(state)?.sources ?? DEFAULT_DEMAND_SOURCES;
+}
+function pageCutsOf(state) {
+  return marksKey.getState(state)?.cuts ?? [];
+}
 function current(view) {
   return marksKey.getState(view.state) ?? { pushes: [], cuts: [] };
 }
@@ -116,7 +124,10 @@ function setPageMarks(view, next) {
       marksKey,
       marksFor(
         view.state.doc,
-        blockKindsOf(view.state),
+        {
+          kinds: blockKindsOf(view.state),
+          sources: demandSourcesOf(view.state)
+        },
         next.pushes,
         next.cuts
       )
@@ -125,6 +136,8 @@ function setPageMarks(view, next) {
 }
 export {
   blockKindsOf,
+  demandSourcesOf,
+  pageCutsOf,
   pageDecorations,
   setPageMarks
 };