@stll/folio-core 0.55.0 → 0.56.0

package/dist/prosemirror/commands/pageBreak.js

@@ -1,4 +1,5 @@
 import { withCanonicalCommand } from "../canonicalCommands.js";
+import { canonicalSelectionRange } from "../canonicalSelectionRange.js";
 import { pageBreakRunParagraphProjectionDisposition } from "../pageBreakRunProjection.js";
 //#region src/prosemirror/commands/pageBreak.ts
 const UNSUPPORTED_PAGE_BREAK_RUN_ANCESTORS = /* @__PURE__ */ new Set([
@@ -46,8 +47,7 @@ const insertPageBreakCommand = (state, dispatch) => {
 */
 const insertPageBreak = withCanonicalCommand(insertPageBreakCommand, (state) => insertPageBreakCommand(state) ? [{
 	type: "insertBreak",
-	from: state.selection.from,
-	to: state.selection.to,
+	...canonicalSelectionRange(state),
 	breakType: "page"
 }] : []);
 //#endregion

package/dist/prosemirror/commands/pastePlainText.js

@@ -1,3 +1,4 @@
+import { dispatchClipboardIntent } from "../clipboardIntent.js";
 import { Fragment, Slice } from "prosemirror-model";
 //#region src/prosemirror/commands/pastePlainText.ts
 /**
@@ -54,7 +55,7 @@ const pasteWithoutFormatting = (state, dispatch, view) => {
 	navigator.clipboard.readText().then((text) => {
 		if (!text || view.isDestroyed) return;
 		const slice = buildPlainTextSlice(text, schema);
-		view.dispatch(view.state.tr.replaceSelection(slice).scrollIntoView());
+		if (dispatchClipboardIntent(view, slice) === void 0) view.dispatch(view.state.tr.replaceSelection(slice).scrollIntoView());
 	}).catch((error) => {
 		if (typeof CustomEvent === "function" && !view.isDestroyed) view.dom.dispatchEvent(new CustomEvent(CLIPBOARD_READ_ERROR_EVENT, {
 			detail: { error },

package/dist/prosemirror/conversion/hyphenTextCarriers.d.ts

@@ -0,0 +1,8 @@
+//#region src/prosemirror/conversion/hyphenTextCarriers.d.ts
+/** These source units render as native text while keeping one logical atom each. */
+declare const HYPHEN_TEXT_CARRIERS: {
+  readonly softHyphen: "­";
+  readonly noBreakHyphen: "‑";
+};
+//#endregion
+export { HYPHEN_TEXT_CARRIERS };

package/dist/prosemirror/conversion/hyphenTextCarriers.js

@@ -0,0 +1,8 @@
+//#region src/prosemirror/conversion/hyphenTextCarriers.ts
+/** These source units render as native text while keeping one logical atom each. */
+const HYPHEN_TEXT_CARRIERS = {
+	softHyphen: "­",
+	noBreakHyphen: "‑"
+};
+//#endregion
+export { HYPHEN_TEXT_CARRIERS };

package/dist/prosemirror/conversion/toProseDoc.d.ts

@@ -18,6 +18,12 @@ type ToProseDocOptions = {
    */
   warn?: ParseContext["warn"];
 };
+/**
+ * Find bookmark pairs across every editable inline wrapper in a document story.
+ * Each endpoint is converted at its own structural position, so a range may
+ * start outside a hyperlink and end inside it (or the inverse).
+ */
+declare const collectPairedBookmarkIds: (blocks: readonly document_d_exports.BlockContent[]) => ReadonlySet<number>;
 /**
  * Convert a Document to a ProseMirror document
  *
@@ -40,4 +46,4 @@ declare function footnoteToProseDoc(content: document_d_exports.BlockContent[],
  */
 declare function createEmptyDoc(): Node;
 //#endregion
-export { ToProseDocOptions, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };
+export { ToProseDocOptions, collectPairedBookmarkIds, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -49,6 +49,7 @@ import { tableCellStyleRegions, tableRowBand } from "../styles/tableStyleRegions
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
+import { HYPHEN_TEXT_CARRIERS } from "./hyphenTextCarriers.js";
 import { listRenderingDefinitionsMatch } from "./listRenderingDefinition.js";
 import { createMarkInterner } from "./markInterner.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
@@ -786,7 +787,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (tableOfContentsLevel !== void 0) attrs._tableOfContentsLevel = tableOfContentsLevel;
 	if (formatting?.numPr) attrs.numPr = paragraphNumberingAttr(formatting.numPr);
 	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = paragraphNumberingAttr(formatting.numPrFromStyle);
-	if (paragraph.listRendering && formatting?.numPr?.kind !== "none") Object.assign(attrs, listRenderingAttrPatch(paragraph.listRendering));
+	if (paragraph.listRendering && formatting?.numPr?.kind !== "none") Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS, listRenderingAttrPatch(paragraph.listRendering));
 	if (formatting) attrs._originalFormatting = formatting;
 	if (paragraph.propertyChanges && paragraph.propertyChanges.length > 0) attrs._propertyChanges = paragraph.propertyChanges.map(({ previousFormatting, ...change }) => {
 		if (previousFormatting === void 0) return change;
@@ -2034,8 +2035,8 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 			text: content.text,
 			level: PRESERVED_XML_LEVELS.run
 		}).mark(marks)];
-		case "noBreakHyphen": return [schema.text("‑", marks)];
-		case "softHyphen": return [schema.text("­", marks)];
+		case "noBreakHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS.noBreakHyphen, marks)];
+		case "softHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS.softHyphen, marks)];
 		case "symbol": return [schema.node("symbol", {
 			font: content.font,
 			char: content.char
@@ -2765,4 +2766,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };
+export { collectPairedBookmarkIds, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -8,7 +8,7 @@ import { collectHeadings } from "../../../utils/headingCollector.js";
 import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
-import { withCanonicalParagraphFormatting } from "../../canonicalCommands.js";
+import { withCanonicalCommand, withCanonicalParagraphFormatting, withCanonicalStartParagraphFormatting } from "../../canonicalCommands.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
@@ -696,7 +696,7 @@ const ParagraphExtension = createNodeExtension({
 			}, { styleId: null }),
 			insertSectionBreak: (breakType) => setSectionBreakType(breakType),
 			removeSectionBreak: () => removeSectionBreakAtSelection,
-			generateTOC: ({ title }) => (state, dispatch) => {
+			generateTOC: ({ title }) => withCanonicalCommand((state, dispatch) => {
 				const builtInStyles = getDocumentBuiltInStyles(state);
 				const headings = collectHeadings(state.doc, builtInStyles);
 				if (headings.length === 0) return false;
@@ -773,44 +773,53 @@ const ParagraphExtension = createNodeExtension({
 				tr.insert(insertPos, Fragment.from(tocNodes));
 				dispatch(tr.scrollIntoView());
 				return true;
-			},
-			toggleBidi: () => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				return setParagraphAttr("direction", directionIsRtl(paragraph.attrs["direction"]) ? {
-					source: "manual",
-					value: "ltr"
-				} : {
+			}, (state) => [{
+				type: "generateTOC",
+				at: state.selection.from,
+				title
+			}]),
+			toggleBidi: () => {
+				const directionFor = (paragraph) => ({
 					source: "manual",
-					value: "rtl"
-				})(state, dispatch);
+					value: directionIsRtl(expectParagraphAttrs(paragraph).direction) ? "ltr" : "rtl"
+				});
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("direction", directionFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ bidi: directionIsRtl(directionFor(paragraph)) }));
 			},
-			setRtl: () => setParagraphAttr("direction", {
+			setRtl: () => withCanonicalParagraphFormatting(setParagraphAttr("direction", {
 				source: "manual",
 				value: "rtl"
-			}),
-			setLtr: () => setParagraphAttr("direction", {
+			}), { bidi: true }),
+			setLtr: () => withCanonicalParagraphFormatting(setParagraphAttr("direction", {
 				source: "manual",
 				value: "ltr"
-			}),
-			setTabs: (tabs) => setParagraphAttr("tabs", tabs.length > 0 ? tabs : null),
-			addTabStop: (position, alignment = "left", leader = "none") => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				return setParagraphAttr("tabs", [...(paragraph.attrs["tabs"] || []).filter((t) => t.position !== position), {
+			}), { bidi: false }),
+			setTabs: (tabs) => withCanonicalParagraphFormatting(setParagraphAttr("tabs", tabs.length > 0 ? tabs : null), { tabs: tabs.length > 0 ? tabs : null }),
+			addTabStop: (position, alignment = "left", leader = "none") => {
+				const tabsFor = (paragraph) => [...(expectParagraphAttrs(paragraph).tabs ?? []).filter((tab) => tab.position !== position), {
 					position,
 					alignment,
 					leader
-				}].toSorted((a, b) => a.position - b.position))(state, dispatch);
+				}].toSorted((a, b) => a.position - b.position);
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("tabs", tabsFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ tabs: tabsFor(paragraph) }));
 			},
-			removeTabStop: (position) => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				const newTabs = (paragraph.attrs["tabs"] || []).filter((t) => t.position !== position);
-				return setParagraphAttr("tabs", newTabs.length > 0 ? newTabs : null)(state, dispatch);
+			removeTabStop: (position) => {
+				const tabsFor = (paragraph) => {
+					const tabs = (expectParagraphAttrs(paragraph).tabs ?? []).filter((tab) => tab.position !== position);
+					return tabs.length > 0 ? tabs : null;
+				};
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("tabs", tabsFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ tabs: tabsFor(paragraph) }));
 			}
 		} };
 	}

package/dist/prosemirror/extensions/marks/HyperlinkExtension.js

@@ -1,6 +1,10 @@
+import { BUILT_IN_STYLE_NAME } from "../../../docx/builtInStyles.js";
 import { anchorTargetAttrs, normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
 import { expectHyperlinkMarkAttrs } from "../../attrs/index.js";
+import { withCanonicalCommand } from "../../canonicalCommands.js";
+import { canonicalSelectionRange } from "../../canonicalSelectionRange.js";
 import { removeHyperlinkInRange } from "../../hyperlinkRemoval.js";
+import { getDocumentBuiltInStyles } from "../../plugins/documentStyleState.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
 import { panic } from "better-result";
@@ -121,7 +125,7 @@ const HyperlinkExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		if (!ctx.schema.marks["hyperlink"]) panic("Missing mark type: hyperlink");
 		const documentHyperlinkType = (state) => state.schema.marks["hyperlink"] ?? panic("Missing mark type: hyperlink");
-		const setHyperlink = (href, tooltip) => (state, dispatch) => {
+		const setHyperlink = (href, tooltip) => withCanonicalCommand((state, dispatch) => {
 			const hlType = documentHyperlinkType(state);
 			const { from, to, empty } = state.selection;
 			if (empty) return false;
@@ -136,34 +140,52 @@ const HyperlinkExtension = createMarkExtension({
 				dispatch(tr.scrollIntoView());
 			}
 			return true;
-		};
-		const removeHyperlink = (state, dispatch) => {
+		}, (state) => state.selection.empty ? [] : [{
+			type: "setHyperlink",
+			...canonicalSelectionRange(state),
+			href: normalizeHyperlinkInput(href),
+			...tooltip ? { tooltip } : {}
+		}]);
+		const removalRange = (state) => {
+			const { empty, $from } = state.selection;
+			const { from, to } = canonicalSelectionRange(state);
+			if (!empty) return {
+				from,
+				to
+			};
 			const hlType = documentHyperlinkType(state);
-			const { from, to, empty } = state.selection;
-			if (empty) {
-				const $pos = state.selection.$from;
-				if (!$pos.marks().find((m) => m.type === hlType)) return false;
-				let start = $pos.pos;
-				let end = $pos.pos;
-				$pos.parent.forEach((node, offset) => {
-					if (node.isText) {
-						const nodeStart = $pos.start() + offset;
-						const nodeEnd = nodeStart + node.nodeSize;
-						if (nodeStart <= $pos.pos && $pos.pos <= nodeEnd) {
-							if (node.marks.some((m) => m.type === hlType)) {
-								start = Math.min(start, nodeStart);
-								end = Math.max(end, nodeEnd);
-							}
-						}
-					}
-				});
-				if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, start, end).scrollIntoView());
-				return true;
-			}
-			if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, from, to).scrollIntoView());
-			return true;
+			if (!$from.marks().some((mark) => mark.type === hlType)) return void 0;
+			let start = from;
+			let end = to;
+			$from.parent.forEach((node, offset) => {
+				const nodeStart = $from.start() + offset;
+				const nodeEnd = nodeStart + node.nodeSize;
+				if (node.isText && nodeStart <= from && from <= nodeEnd && node.marks.some((mark) => mark.type === hlType)) {
+					start = Math.min(start, nodeStart);
+					end = Math.max(end, nodeEnd);
+				}
+			});
+			return {
+				from: start,
+				to: end
+			};
 		};
-		const insertHyperlink = (text, href, tooltip) => (state, dispatch) => {
+		const removeHyperlink = withCanonicalCommand((state, dispatch) => {
+			const range = removalRange(state);
+			if (!range) return false;
+			if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, range.from, range.to).scrollIntoView());
+			return true;
+		}, (state) => {
+			const range = removalRange(state);
+			if (!range) return [];
+			const hyperlinkStyleId = getDocumentBuiltInStyles(state).styleIdForBuiltInName(BUILT_IN_STYLE_NAME.hyperlink);
+			return [{
+				type: "removeHyperlink",
+				...range,
+				...hyperlinkStyleId === void 0 ? {} : { hyperlinkStyleId }
+			}];
+		});
+		const insertHyperlink = (text, href, tooltip) => withCanonicalCommand((state, dispatch) => {
 			const hlType = documentHyperlinkType(state);
 			if (dispatch) {
 				const mark = hlType.create({
@@ -174,7 +196,13 @@ const HyperlinkExtension = createMarkExtension({
 				dispatch(state.tr.replaceSelectionWith(textNode, false).scrollIntoView());
 			}
 			return true;
-		};
+		}, (state) => [{
+			type: "insertHyperlink",
+			...canonicalSelectionRange(state),
+			text,
+			href: normalizeHyperlinkInput(href),
+			...tooltip ? { tooltip } : {}
+		}]);
 		return { commands: {
 			setHyperlink,
 			removeHyperlink: () => removeHyperlink,

package/dist/prosemirror/extensions/marks/markUtils.js

@@ -3,6 +3,7 @@ import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
 import { normalizeHorizontalScalePercent } from "../../../utils/horizontalScale.js";
 import { expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectEmphasisMarkAttrs, expectFontFamilyMarkAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectStrikeMarkAttrs, expectTextEffectMarkAttrs } from "../../attrs/index.js";
 import { canonicalRunFormatting, withCanonicalCommand } from "../../canonicalCommands.js";
+import { canonicalSelectionRange } from "../../canonicalSelectionRange.js";
 import { runShadingAttrsToShading, shadingToRunShadingAttrs } from "../../conversion/runShadingMark.js";
 import { documentMarkType } from "../../documentSchema.js";
 import { selectRunFormattingCarrierRepresentations } from "../../runFormattingInlineCarriers.js";
@@ -188,7 +189,8 @@ function createMarkWithMergedAttrs(markType, currentMark, nextAttrs) {
 }
 const canonicalSetMarkFormatting = ({ state, type, attrs }) => {
 	const markType = documentMarkType(state, type);
-	const { from, to, empty } = state.selection;
+	const { empty } = state.selection;
+	const { from, to } = canonicalSelectionRange(state);
 	if (empty) return canonicalRunFormatting(state, marksToTextFormatting([createMarkWithMergedAttrs(markType, markType.isInSet(state.storedMarks ?? state.selection.$from.marks()), attrs)]));
 	return selectRunFormattingCarrierRepresentations({
 		doc: state.doc,

package/dist/prosemirror/insertOperations.js

@@ -2,6 +2,7 @@ import { insertImageFromFile } from "./commands/image.js";
 import { insertPageBreak } from "./commands/pageBreak.js";
 import { generateTableOfContents } from "./commands/paragraph.js";
 import { insertTable } from "./commands/table.js";
+import { executeEditorCommand } from "./executeEditorCommand.js";
 //#region src/prosemirror/insertOperations.ts
 /** Insert a `rows × columns` table at the current selection. */
 function insertTableInView(view, rows, columns) {
@@ -18,7 +19,7 @@ function insertPageBreakInView(view) {
 * {@link GenerateTableOfContentsOptions}.
 */
 function insertTableOfContentsInView(view, options) {
-	return generateTableOfContents(options)(view.state, view.dispatch);
+	return executeEditorCommand(view, generateTableOfContents(options));
 }
 //#endregion
 export { insertImageFromFile, insertPageBreakInView, insertTableInView, insertTableOfContentsInView };

package/dist/prosemirror/paragraphPropertyCarry.d.ts

@@ -4,6 +4,7 @@ import { NumberingMap } from "../docx/numberingParser.js";
 import { Node } from "prosemirror-model";
 import { Transaction } from "prosemirror-state";
 //#region src/prosemirror/paragraphPropertyCarry.d.ts
+type RecordedFormatting = NonNullable<ParagraphPropertyChangeAttrs["previousFormatting"]>;
 type CarryParagraphPropertiesOptions = {
   tr: Transaction;
   /** The paragraph that takes the properties. */
@@ -17,6 +18,11 @@ type CarryParagraphPropertiesOptions = {
   /** Properties the paragraph keeps its own values of: ones its own batch set. */
   keep?: ReadonlySet<string>;
 };
+type CarriedParagraphPropertiesOptions = Pick<CarryParagraphPropertiesOptions, "source" | "keep"> & {
+  target: Node;
+};
+/** The exact formatting transfer, shared with pre-mutation capacity checks. */
+declare const carriedParagraphProperties: ({ source, target, keep }: CarriedParagraphPropertiesOptions) => RecordedFormatting;
 /**
  * Give a paragraph another one's properties: the pPr a property change
  * covers. Its identity, mark, mark run properties and section stay its own,
@@ -61,4 +67,4 @@ declare const recordReplacedParagraphProperties: ({ tr, position, replaced, revi
  */
 declare const propertiesSetInBatch: (node: Node, batchRevisionIds: ReadonlySet<number>) => ReadonlySet<string>;
 //#endregion
-export { carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties };
+export { carriedParagraphProperties, carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties };

package/dist/prosemirror/paragraphPropertyCarry.js

@@ -17,6 +17,8 @@ import { panic } from "better-result";
 * revision, so accepting reads as the direct edit and rejecting restores the
 * second's own.
 */
+/** The exact formatting transfer, shared with pre-mutation capacity checks. */
+const carriedParagraphProperties = ({ source, target, keep }) => Object.fromEntries([...Object.entries(paragraphPropertiesSnapshot(source)).filter(([key]) => !keep?.has(key)), ...Object.entries(paragraphPropertiesSnapshot(target)).filter(([key]) => keep?.has(key))]);
 /**
 * Give a paragraph another one's properties: the pPr a property change
 * covers. Its identity, mark, mark run properties and section stay its own,
@@ -32,8 +34,11 @@ const carryParagraphProperties = ({ tr, position, source, styleResolver, numberi
 		tracked: false
 	};
 	const previousFormatting = paragraphPropertiesSnapshot(target);
-	const own = previousFormatting;
-	const formatting = Object.fromEntries([...Object.entries(paragraphPropertiesSnapshot(source)).filter(([key]) => !keep?.has(key)), ...Object.entries(own).filter(([key]) => keep?.has(key))]);
+	const formatting = carriedParagraphProperties({
+		source,
+		target,
+		...keep === void 0 ? {} : { keep }
+	});
 	if (JSON.stringify(previousFormatting) === JSON.stringify(formatting)) return {
 		tr,
 		changed: false,
@@ -152,4 +157,4 @@ const propertiesSetInBatch = (node, batchRevisionIds) => {
 	return new Set([.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(now)])].filter((key) => JSON.stringify(before[key]) !== JSON.stringify(now[key])));
 };
 //#endregion
-export { carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties };
+export { carriedParagraphProperties, carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties };

package/dist/prosemirror/plugins/suggestionMode.js

@@ -661,21 +661,23 @@ function handleSuggestionEnter(view, pluginState) {
 	view.dispatch(tr.scrollIntoView());
 	return true;
 }
-/** Find the adjacent visible unit without consuming a bookmark range marker. */
+/** Find the adjacent visible unit without consuming retained deletions or bookmark markers. */
 function caretDeleteTarget(state, direction) {
 	const { $from } = state.selection;
 	const backward = direction === "backward";
 	let from = backward ? $from.pos - 1 : $from.pos;
 	let to = backward ? $from.pos : $from.pos + 1;
 	while (from >= $from.start() && to <= $from.end()) {
-		const adjacent = state.doc.resolve(from).nodeAfter;
-		if (adjacent?.type.name !== "bookmarkBoundary") return {
+		const $adjacent = state.doc.resolve(from);
+		const adjacent = $adjacent.nodeAfter;
+		if (!adjacent || adjacent.type.name !== "bookmarkBoundary" && !adjacent.marks.some((mark) => mark.type === state.schema.marks["deletion"])) return {
 			type: "inlineUnit",
 			from,
 			to
 		};
-		from += backward ? -adjacent.nodeSize : adjacent.nodeSize;
-		to += backward ? -adjacent.nodeSize : adjacent.nodeSize;
+		const skipped = backward && adjacent.isText ? $adjacent.textOffset + 1 : adjacent.nodeSize;
+		from += backward ? -skipped : skipped;
+		to += backward ? -skipped : skipped;
 	}
 	return { type: "paragraphEdge" };
 }