@stll/folio-core 0.54.0 → 0.54.2

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.0",
+  "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,9 +134,9 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.29.0",
+    "@stll/docx-core": "^0.30.1",
     "@stll/docx-utils": "^0.1.0",
-    "@stll/template-conditions": ">=0.4.0 <1.0.0",
+    "@stll/template-conditions": "^0.6.2",
     "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.13",