@stll/folio-core 0.54.1 → 0.54.2

package/dist/prosemirror/storyListNumbering.js

@@ -1,3 +1,4 @@
+import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { getCachedNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
 import { paragraphNumberingLevel, paragraphNumberingReference, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
@@ -20,16 +21,11 @@ const remappedAbstractNumId = (abstractNumId, remap) => {
 	if (abstractNumId === null || abstractNumId === void 0 || remap.baseAbstractNumIds.has(abstractNumId)) return abstractNumId;
 	let next = remap.abstractNumIds.get(abstractNumId);
 	if (next === void 0) {
-		next = remap.nextAbstractNumId++;
+		next = remap.abstractIds.next();
 		remap.abstractNumIds.set(abstractNumId, next);
 	}
 	return next;
 };
-const maxOf = (ids, floor) => {
-	let max = floor;
-	for (const id of ids) max = Math.max(max, id);
-	return max;
-};
 /**
 * The story in `state` as it should be written into a package whose numbering
 * is now `numbering`, and that numbering completed with the story's lists.
@@ -41,10 +37,16 @@ const storyListNumbering = (state, numbering) => {
 	const definedMap = numbering ? getCachedNumberingMap(numbering) : null;
 	const referenced = /* @__PURE__ */ new Set();
 	const colliding = /* @__PURE__ */ new Set();
+	const existingAbstractNumIds = /* @__PURE__ */ new Set([...(numbering?.abstractNums ?? []).map(({ abstractNumId }) => abstractNumId), ...(packageDefinitions?.abstractNums ?? []).map(({ abstractNumId }) => abstractNumId)]);
 	state.doc.descendants((node) => {
 		if (node.type.name !== "paragraph") return true;
 		for (const numId of paragraphListReferences(node)) referenced.add(numId);
 		const attrs = expectParagraphAttrs(node);
+		if (typeof attrs.listAbstractNumId === "number") existingAbstractNumIds.add(attrs.listAbstractNumId);
+		for (const change of attrs._propertyChanges ?? []) {
+			const abstractId = change.previousFormatting?.listAbstractNumId;
+			if (typeof abstractId === "number") existingAbstractNumIds.add(abstractId);
+		}
 		const numId = paragraphNumberingReferenceId(attrs.numPr);
 		if (numId !== void 0 && !storyBase.has(numId) && definedMap?.hasNumbering(numId)) {
 			const level = definedMap.getLevel(numId, paragraphNumberingLevel(attrs.numPr) ?? 0);
@@ -56,12 +58,12 @@ const storyListNumbering = (state, numbering) => {
 		doc: state.doc,
 		numbering: completeNumberingForDoc(numbering, state.doc)
 	};
-	let nextNumId = maxOf([...defined, ...referenced], 0) + 1;
+	const numIds = createNumberingIdAllocator("num", [...defined, ...referenced]);
 	const remap = {
-		numIds: new Map([...colliding].map((numId) => [numId, nextNumId++])),
+		numIds: new Map([...colliding].map((numId) => [numId, numIds.next()])),
 		baseAbstractNumIds: new Set((packageDefinitions?.abstractNums ?? []).map(({ abstractNumId }) => abstractNumId)),
 		abstractNumIds: /* @__PURE__ */ new Map(),
-		nextAbstractNumId: maxOf((numbering?.abstractNums ?? []).map(({ abstractNumId }) => abstractNumId), -1) + 1
+		abstractIds: createNumberingIdAllocator("abstract", existingAbstractNumIds)
 	};
 	const tr = new Transform(state.doc);
 	state.doc.descendants((node, pos) => {

package/dist/prosemirror/textInput.d.ts

@@ -15,7 +15,12 @@ type TextInput = {
 declare const dispatchEditorTextInput: <TView extends TextInputDispatchTarget<TView>>(view: TView, input: string | TextInput) => void;
 /** Shared DOM boundary for editor runtimes and standalone suggestion views. */
 declare const handleEditorBeforeInput: (view: EditorView, event: InputEvent) => boolean;
+/**
+ * Plugin compositionend handlers run before ProseMirror queues its final DOM
+ * flush. A second microtask runs after that flush and sees the committed state.
+ */
+declare const afterNativeCompositionFlush: (callback: () => void) => void;
 /** Route committed text through the model before the browser mutates mark spans. */
 declare const createTextInputPlugin: () => Plugin<any>;
 //#endregion
-export { createTextInputPlugin, dispatchEditorTextInput, handleEditorBeforeInput };
+export { afterNativeCompositionFlush, createTextInputPlugin, dispatchEditorTextInput, handleEditorBeforeInput };

package/dist/prosemirror/textInput.js

@@ -45,6 +45,13 @@ const handleEditorBeforeInput = (view, event) => {
 	});
 	return true;
 };
+/**
+* Plugin compositionend handlers run before ProseMirror queues its final DOM
+* flush. A second microtask runs after that flush and sees the committed state.
+*/
+const afterNativeCompositionFlush = (callback) => {
+	queueMicrotask(() => queueMicrotask(callback));
+};
 /** Route committed text through the model before the browser mutates mark spans. */
 const createTextInputPlugin = () => {
 	const compositions = /* @__PURE__ */ new WeakMap();
@@ -55,7 +62,7 @@ const createTextInputPlugin = () => {
 		},
 		compositionend(view, event) {
 			compositions.set(view, event);
-			queueMicrotask(() => {
+			afterNativeCompositionFlush(() => {
 				if (compositions.get(view) === event) compositions.delete(view);
 			});
 			return false;
@@ -67,4 +74,4 @@ const createTextInputPlugin = () => {
 	} } });
 };
 //#endregion
-export { createTextInputPlugin, dispatchEditorTextInput, handleEditorBeforeInput };
+export { afterNativeCompositionFlush, createTextInputPlugin, dispatchEditorTextInput, handleEditorBeforeInput };

package/dist/prosemirror/utils/visualLineNavigation.js

@@ -1,7 +1,7 @@
 import { findCollapsedLineEdgeCaretTarget } from "../../layout-bridge/dom/clickToPositionDom.js";
 import { findBodyEmptyRuns, findBodyPmSpans } from "../../layout-bridge/dom/findBodyPmSpans.js";
 import { createTextStreamRange, descendantTextNodes, totalTextLength } from "../../layout-bridge/dom/textStreamDom.js";
-import { findVerticalScrollParent } from "../../utils/findVerticalScrollParent.js";
+import { scrollEditorElementIntoView } from "../../paged-layout/editorScrollRoot.js";
 import { Selection, TextSelection } from "prosemirror-state";
 //#region src/prosemirror/utils/visualLineNavigation.ts
 /**
@@ -24,13 +24,11 @@ function createVisualLineState() {
 	return { step: null };
 }
 function scrollIntoViewIfNeeded(el) {
-	const container = findVerticalScrollParent(el);
-	if (!container) return;
-	const elRect = el.getBoundingClientRect();
-	const containerRect = container.getBoundingClientRect();
-	const margin = 40;
-	if (elRect.bottom > containerRect.bottom - margin) container.scrollTop += elRect.bottom - containerRect.bottom + margin;
-	else if (elRect.top < containerRect.top + margin) container.scrollTop -= containerRect.top - elRect.top + margin;
+	scrollEditorElementIntoView(el, {
+		block: "nearest",
+		margin: 40,
+		behavior: "instant"
+	});
 }
 /** @internal */
 function getCaretClientX(container, pmPos) {

package/dist/utils/mergeDocumentContent.d.ts

@@ -9,8 +9,8 @@ import { document_d_exports } from "../types/document.js";
  * merging markdown (or any other document) into a styled preset keeps that
  * preset's look. Only `source`'s numbering — the `w:abstractNum`/`w:num`
  * definitions its content's `numPr` references — travels with it, and every
- * `abstractNumId`/`numId` it carries is renumbered to sit strictly above
- * whatever `target` already uses. This is unconditional (not just on a
+ * `abstractNumId`/`numId` it carries moves to a fresh bounded id, preferring
+ * ids above the loaded range. This is unconditional (not just on a
  * detected collision): it is simpler to reason about, and makes repeated
  * merges into the same target safe too (merging two sources that each mint
  * `numId` 1 does not collide with each other either).

package/dist/utils/mergeDocumentContent.js

@@ -1,3 +1,4 @@
+import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { cloneParagraphWithoutPropertySource } from "../docx/paragraphPropertySource.js";
 //#region src/utils/mergeDocumentContent.ts
@@ -10,8 +11,8 @@ import { cloneParagraphWithoutPropertySource } from "../docx/paragraphPropertySo
 * merging markdown (or any other document) into a styled preset keeps that
 * preset's look. Only `source`'s numbering — the `w:abstractNum`/`w:num`
 * definitions its content's `numPr` references — travels with it, and every
-* `abstractNumId`/`numId` it carries is renumbered to sit strictly above
-* whatever `target` already uses. This is unconditional (not just on a
+* `abstractNumId`/`numId` it carries moves to a fresh bounded id, preferring
+* ids above the loaded range. This is unconditional (not just on a
 * detected collision): it is simpler to reason about, and makes repeated
 * merges into the same target safe too (merging two sources that each mint
 * `numId` 1 does not collide with each other either).
@@ -53,11 +54,13 @@ function mergeDocumentContent(target, source) {
 		}
 	};
 	function remapContentNumbering(content, numbering) {
-		const abstractNumIdBase = Math.max(0, ...(targetNumbering?.abstractNums ?? []).map((abstractNum) => abstractNum.abstractNumId));
-		const numIdBase = Math.max(0, ...(targetNumbering?.nums ?? []).map((num) => num.numId));
+		const existingAbstractIds = [...(targetNumbering?.abstractNums ?? []).map(({ abstractNumId }) => abstractNumId), ...numbering.abstractNums.map(({ abstractNumId }) => abstractNumId)];
+		const existingNumIds = [...(targetNumbering?.nums ?? []).map(({ numId }) => numId), ...numbering.nums.map(({ numId }) => numId)];
+		const abstractIds = createNumberingIdAllocator("abstract", existingAbstractIds);
+		const numIds = createNumberingIdAllocator("num", existingNumIds);
 		const abstractNumIdRemap = /* @__PURE__ */ new Map();
-		const remappedAbstractNums = numbering.abstractNums.map((abstractNum, index) => {
-			const remappedAbstractNumId = abstractNumIdBase + index + 1;
+		const remappedAbstractNums = numbering.abstractNums.map((abstractNum) => {
+			const remappedAbstractNumId = abstractIds.next();
 			abstractNumIdRemap.set(abstractNum.abstractNumId, remappedAbstractNumId);
 			return {
 				...abstractNum,
@@ -65,8 +68,8 @@ function mergeDocumentContent(target, source) {
 			};
 		});
 		const numIdRemap = /* @__PURE__ */ new Map();
-		const remappedNums = numbering.nums.map((num, index) => {
-			const remappedNumId = numIdBase + index + 1;
+		const remappedNums = numbering.nums.map((num) => {
+			const remappedNumId = numIds.next();
 			numIdRemap.set(num.numId, remappedNumId);
 			return {
 				...num,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -134,7 +134,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.30.0",
+    "@stll/docx-core": "^0.30.1",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.6.2",
     "better-result": "3.0.1",