@stll/folio-core 0.61.0 → 0.63.0

package/dist/prosemirror/extensions/marks/CharacterStyleExtension.d.ts

@@ -14,6 +14,5 @@ import { MarkExtension } from "../types.js";
  * attribute. parseDOM restores the styleId (so copy/paste inside the editor
  * keeps the reference).
  */
-declare const CharacterStyleExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { CharacterStyleExtension };
+export declare const CharacterStyleExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/CommentExtension.d.ts

@@ -6,6 +6,5 @@ import { MarkExtension } from "../types.js";
  * Applied to text ranges between commentRangeStart and commentRangeEnd.
  * The comment ID links to the Comment object in the document model.
  */
-declare const CommentExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { CommentExtension };
+export declare const CommentExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/FontFamilyExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Font Family Mark Extension
  */
-declare const FontFamilyExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { FontFamilyExtension };
+export declare const FontFamilyExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -1,6 +1,7 @@
 import { expectFontFamilyMarkAttrs } from "../../attrs/index.js";
+import { canonicalRunFormatting } from "../../canonicalCommands.js";
 import { createMarkExtension } from "../create.js";
-import { removeMark, setMark } from "./markUtils.js";
+import { canonicalSetMarkFormatting, removeMark, setMark, withRunFormattingLock } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/FontFamilyExtension.ts
 /**
@@ -44,11 +45,18 @@ const FontFamilyExtension = createMarkExtension({
 		const fontFamilyType = ctx.schema.marks["fontFamily"];
 		if (!fontFamilyType) panic("Missing mark type: fontFamily");
 		return { commands: {
-			setFontFamily: (fontName) => setMark(fontFamilyType, {
+			setFontFamily: (fontName) => withRunFormattingLock(setMark(fontFamilyType, {
 				ascii: fontName,
 				hAnsi: fontName
-			}),
-			clearFontFamily: () => removeMark(fontFamilyType)
+			}), (state) => canonicalSetMarkFormatting({
+				state,
+				type: fontFamilyType,
+				attrs: {
+					ascii: fontName,
+					hAnsi: fontName
+				}
+			})),
+			clearFontFamily: () => withRunFormattingLock(removeMark(fontFamilyType), (state) => canonicalRunFormatting(state, { fontFamily: null }))
 		} };
 	}
 });

package/dist/prosemirror/extensions/marks/FontSizeExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Font Size Mark Extension
  */
-declare const FontSizeExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { FontSizeExtension };
+export declare const FontSizeExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/FootnoteRefExtension.d.ts

@@ -5,6 +5,5 @@ import { MarkExtension } from "../types.js";
  *
  * Provides footnoteRef mark + insert/delete commands for footnotes and endnotes.
  */
-declare const FootnoteRefExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { FootnoteRefExtension };
+export declare const FootnoteRefExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -1,9 +1,11 @@
 import { expectFootnoteRefMarkAttrs } from "../../attrs/index.js";
+import { withCanonicalCommand } from "../../canonicalCommands.js";
 import { mintNoteReferenceOccurrenceId, noteReferenceOccurrencePlugin } from "../../noteReferenceOccurrences.js";
 import { suggestRangeDeletion, suggestionModeKey } from "../../plugins/suggestionMode.js";
 import { createMarkExtension } from "../create.js";
 import { expandNoteReferenceDeletionRange, noteReferenceRanges } from "./noteReferenceDeletion.js";
 import { panic } from "better-result";
+import { TextSelection } from "prosemirror-state";
 //#region src/prosemirror/extensions/marks/FootnoteRefExtension.ts
 /**
 * Footnote Reference Mark Extension
@@ -90,7 +92,10 @@ const FootnoteRefExtension = createMarkExtension({
 					vertAlign: "superscript"
 				});
 				const text = schema.text(String(id), [mark]);
-				dispatch(state.tr.replaceSelectionWith(text, false).scrollIntoView());
+				const insertionEnd = state.selection.to + text.nodeSize;
+				const tr = state.tr.insert(state.selection.to, text);
+				tr.setSelection(TextSelection.create(tr.doc, insertionEnd));
+				dispatch(tr.scrollIntoView());
 				return true;
 			};
 		}
@@ -116,9 +121,42 @@ const FootnoteRefExtension = createMarkExtension({
 				Delete: deleteWholeNoteReference("forward")
 			},
 			commands: {
-				insertFootnote: makeInsertNote("footnote"),
-				insertEndnote: makeInsertNote("endnote"),
-				deleteNoteRef: () => deleteNoteRef
+				insertFootnote: (id, content = [{
+					type: "paragraph",
+					content: []
+				}]) => withCanonicalCommand(makeInsertNote("footnote")(id), (state) => [{
+					type: "insertNote",
+					at: state.selection.to,
+					kind: "footnote",
+					id,
+					content
+				}]),
+				insertEndnote: (id, content = [{
+					type: "paragraph",
+					content: []
+				}]) => withCanonicalCommand(makeInsertNote("endnote")(id), (state) => [{
+					type: "insertNote",
+					at: state.selection.to,
+					kind: "endnote",
+					id,
+					content
+				}]),
+				deleteNoteRef: () => withCanonicalCommand(deleteNoteRef, (state) => {
+					const { from, to, empty } = state.selection;
+					return noteReferenceRanges(state.doc, empty ? Math.max(0, from - 1) : from, empty ? Math.min(state.doc.content.size, to + 1) : to).flatMap((range) => {
+						const mark = state.doc.nodeAt(range.from)?.marks.find((candidate) => candidate.type.name === "footnoteRef");
+						if (!mark) return [];
+						const attrs = expectFootnoteRefMarkAttrs(mark);
+						const id = Number(attrs.id);
+						if (!Number.isSafeInteger(id) || id <= 0) return [];
+						return [{
+							type: "deleteNote",
+							from: range.from,
+							kind: attrs.noteType ?? "footnote",
+							id
+						}];
+					});
+				})
 			}
 		};
 	}

package/dist/prosemirror/extensions/marks/HiddenTextExtension.d.ts

@@ -17,6 +17,5 @@ import { MarkExtension } from "../types.js";
  *
  * eigenpal #424 (w:vanish gap 9).
  */
-declare const HiddenTextExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { HiddenTextExtension };
+export declare const HiddenTextExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/HighlightExtension.d.ts

@@ -2,8 +2,8 @@ import { document_d_exports } from "../../../types/document.js";
 import { MarkExtension } from "../types.js";
 //#region src/prosemirror/extensions/marks/HighlightExtension.d.ts
 type HighlightColor = NonNullable<document_d_exports.TextFormatting["highlight"]>;
-declare const normalizeCssColorKey: (value: string) => string;
-declare const parseDOMHighlightColor: (value: string) => HighlightColor | null;
-declare const HighlightExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const normalizeCssColorKey: (value: string) => string;
+export declare const parseDOMHighlightColor: (value: string) => HighlightColor | null;
+export declare const HighlightExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 //#endregion
-export { HighlightExtension, normalizeCssColorKey, parseDOMHighlightColor };
+export {};

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

@@ -1,8 +1,9 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../../types/documentEnumValues.js";
 import { resolveHighlightToCss } from "../../../utils/colorResolver.js";
 import { expectHighlightMarkAttrs } from "../../attrs/index.js";
+import { canonicalRunFormatting } from "../../canonicalCommands.js";
 import { createMarkExtension } from "../create.js";
-import { removeMark, setMark } from "./markUtils.js";
+import { removeMark, setMark, withRunFormattingLock } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/HighlightExtension.ts
 /**
@@ -104,10 +105,11 @@ const HighlightExtension = createMarkExtension({
 		if (!highlightType) panic("Missing mark type: highlight");
 		return { commands: {
 			setHighlight: (color) => {
-				if (!color || color === "none") return removeMark(highlightType);
-				return setMark(highlightType, { color: parseDOMHighlightColor(color) ?? "yellow" });
+				if (!color || color === "none") return withRunFormattingLock(removeMark(highlightType), (state) => canonicalRunFormatting(state, { highlight: null }));
+				const highlight = parseDOMHighlightColor(color) ?? "yellow";
+				return withRunFormattingLock(setMark(highlightType, { color: highlight }), (state) => canonicalRunFormatting(state, { highlight }));
 			},
-			clearHighlight: () => removeMark(highlightType)
+			clearHighlight: () => withRunFormattingLock(removeMark(highlightType), (state) => canonicalRunFormatting(state, { highlight: null }))
 		} };
 	}
 });

package/dist/prosemirror/extensions/marks/HyperlinkExtension.d.ts

@@ -1,12 +1,11 @@
 import { MarkExtension } from "../types.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/extensions/marks/HyperlinkExtension.d.ts
-declare function isHyperlinkActive(state: EditorState): boolean;
-declare function getHyperlinkAttrs(state: EditorState): {
+export declare function isHyperlinkActive(state: EditorState): boolean;
+export declare function getHyperlinkAttrs(state: EditorState): {
   href: string;
   tooltip?: string;
 } | null;
-declare function getSelectedText(state: EditorState): string;
-declare const HyperlinkExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { HyperlinkExtension, getHyperlinkAttrs, getSelectedText, isHyperlinkActive };
+export declare function getSelectedText(state: EditorState): string;
+export declare const HyperlinkExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -8,11 +8,13 @@ import { getDocumentBuiltInStyles } from "../../plugins/documentStyleState.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
 import { panic } from "better-result";
+import { CellSelection } from "prosemirror-tables";
 //#region src/prosemirror/extensions/marks/HyperlinkExtension.ts
 /**
 * Hyperlink Mark Extension
 */
 const DOCX_HYPERLINK_INDEX_ATTRIBUTE = "data-docx-hyperlink-index";
+const DOCX_HYPERLINK_ANCHOR_ATTRIBUTE = "data-docx-hyperlink-anchor";
 /**
 * Sanitize an href arriving from (or being emitted to) the DOM: pasted HTML,
 * clipboard content, or a mark attr already stored on the document. Only
@@ -86,6 +88,7 @@ const HyperlinkExtension = createMarkExtension({
 	markSpec: {
 		attrs: {
 			href: {},
+			anchor: { default: null },
 			tooltip: { default: null },
 			rId: { default: null },
 			target: { default: null },
@@ -101,6 +104,7 @@ const HyperlinkExtension = createMarkExtension({
 				const docxHyperlinkIndex = index !== null && /^\d+$/u.test(index) && Number.isSafeInteger(Number(index)) ? Number(index) : void 0;
 				return {
 					href: sanitizeStoredHref(dom.getAttribute("href") ?? void 0),
+					anchor: dom.getAttribute(DOCX_HYPERLINK_ANCHOR_ATTRIBUTE) ?? void 0,
 					tooltip: dom.getAttribute("title") ?? void 0,
 					target: dom.getAttribute("target") ?? void 0,
 					...docxHyperlinkIndex === void 0 ? {} : { _docxHyperlinkIndex: docxHyperlinkIndex }
@@ -108,12 +112,13 @@ const HyperlinkExtension = createMarkExtension({
 			}
 		}],
 		toDOM(mark) {
-			const { href, target, tooltip, _docxHyperlinkIndex } = expectHyperlinkMarkAttrs(mark);
+			const { href, anchor, target, tooltip, _docxHyperlinkIndex } = expectHyperlinkMarkAttrs(mark);
 			const domAttrs = {
 				href: sanitizeStoredHref(href),
 				...anchorTargetAttrs(target)
 			};
 			if (tooltip) domAttrs["title"] = tooltip;
+			if (anchor !== void 0) domAttrs[DOCX_HYPERLINK_ANCHOR_ATTRIBUTE] = anchor;
 			if (typeof _docxHyperlinkIndex === "number") domAttrs[DOCX_HYPERLINK_INDEX_ATTRIBUTE] = String(_docxHyperlinkIndex);
 			return [
 				"a",
@@ -140,13 +145,14 @@ const HyperlinkExtension = createMarkExtension({
 				dispatch(tr.scrollIntoView());
 			}
 			return true;
-		}, (state) => state.selection.empty ? [] : [{
+		}, (state) => state.selection.empty || state.selection instanceof CellSelection ? [] : [{
 			type: "setHyperlink",
 			...canonicalSelectionRange(state),
 			href: normalizeHyperlinkInput(href),
 			...tooltip ? { tooltip } : {}
 		}]);
 		const removalRange = (state) => {
+			if (state.selection instanceof CellSelection) return void 0;
 			const { empty, $from } = state.selection;
 			const { from, to } = canonicalSelectionRange(state);
 			assertHyperlinkRemovalRange({
@@ -204,7 +210,7 @@ const HyperlinkExtension = createMarkExtension({
 				dispatch(state.tr.replaceSelectionWith(textNode, false).scrollIntoView());
 			}
 			return true;
-		}, (state) => [{
+		}, (state) => state.selection instanceof CellSelection ? [] : [{
 			type: "insertHyperlink",
 			...canonicalSelectionRange(state),
 			text,

package/dist/prosemirror/extensions/marks/InlineWrapperExtension.d.ts

@@ -12,7 +12,6 @@ import { MarkExtension } from "../types.js";
  * `inclusive: false` so typing at the end of a wrapped span does not silently
  * extend the wrapper over text the author wrote outside it.
  */
-declare const INLINE_WRAPPER_MARK_NAME = "inlineWrapper";
-declare const InlineWrapperExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { INLINE_WRAPPER_MARK_NAME, InlineWrapperExtension };
+export declare const INLINE_WRAPPER_MARK_NAME = "inlineWrapper";
+export declare const InlineWrapperExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/ItalicExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Italic Mark Extension
  */
-declare const ItalicExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { ItalicExtension };
+export declare const ItalicExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/LanguageExtension.d.ts

@@ -1,6 +1,5 @@
 import { MarkExtension } from "../types.js";
 //#region src/prosemirror/extensions/marks/LanguageExtension.d.ts
 /** Preserve OOXML `w:lang` and expose its primary language to the editing DOM. */
-declare const LanguageExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { LanguageExtension };
+export declare const LanguageExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/RtlExtension.d.ts

@@ -1,5 +1,4 @@
 import { MarkExtension } from "../types.js";
 //#region src/prosemirror/extensions/marks/RtlExtension.d.ts
-declare const RtlExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { RtlExtension };
+export declare const RtlExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/RunFormattingOverrideExtension.d.ts

@@ -9,9 +9,9 @@ type BuildRunFormattingOverrideAttrsOptions = {
 } | {
   type: "structural-only";
 };
-declare function buildRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting | undefined, options?: BuildRunFormattingOverrideAttrsOptions): RunFormattingOverrideAttrs | undefined;
-declare function applyRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting, attrs: RunFormattingOverrideAttrs): void;
-declare function applyRunFormattingOverrideMark(formatting: document_d_exports.TextFormatting, mark: Mark): void;
-declare const RunFormattingOverrideExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare function buildRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting | undefined, options?: BuildRunFormattingOverrideAttrsOptions): RunFormattingOverrideAttrs | undefined;
+export declare function applyRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting, attrs: RunFormattingOverrideAttrs): void;
+export declare function applyRunFormattingOverrideMark(formatting: document_d_exports.TextFormatting, mark: Mark): void;
+export declare const RunFormattingOverrideExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 //#endregion
-export { RunFormattingOverrideExtension, applyRunFormattingOverrideAttrs, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };
+export {};

package/dist/prosemirror/extensions/marks/RunIdentityExtension.d.ts

@@ -23,7 +23,7 @@ type InsertedRange = {
  *
  * @internal Exported for the per-step equivalence test.
  */
-declare const insertedRanges: (transactions: readonly Transaction[], skip?: (transaction: Transaction) => boolean) => InsertedRange[];
-declare const RunIdentityExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const insertedRanges: (transactions: readonly Transaction[], skip?: (transaction: Transaction) => boolean) => InsertedRange[];
+export declare const RunIdentityExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 //#endregion
-export { RunIdentityExtension, insertedRanges };
+export {};

package/dist/prosemirror/extensions/marks/RunShadingExtension.d.ts

@@ -1,5 +1,4 @@
 import { MarkExtension } from "../types.js";
 //#region src/prosemirror/extensions/marks/RunShadingExtension.d.ts
-declare const RunShadingExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { RunShadingExtension };
+export declare const RunShadingExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/SmallCapsExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Small Caps Mark Extension (w:smallCaps)
  */
-declare const SmallCapsExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { SmallCapsExtension };
+export declare const SmallCapsExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/StrikeExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Strikethrough Mark Extension
  */
-declare const StrikeExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { StrikeExtension };
+export declare const StrikeExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -1,5 +1,6 @@
+import { canonicalRunFormatting } from "../../canonicalCommands.js";
 import { createMarkExtension } from "../create.js";
-import { toggleDocumentMark } from "./markUtils.js";
+import { isMarkActive, toggleDocumentMark, withRunFormattingLock } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/StrikeExtension.ts
 /**
@@ -13,7 +14,6 @@ const StrikeExtension = createMarkExtension({
 		parseDOM: [
 			{ tag: "s" },
 			{ tag: "strike" },
-			{ tag: "del" },
 			{
 				style: "text-decoration",
 				getAttrs: (value) => value.includes("line-through") ? {} : false
@@ -26,7 +26,13 @@ const StrikeExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		const strikeType = ctx.schema.marks["strike"];
 		if (!strikeType) panic("Missing mark type: strike");
-		return { commands: { toggleStrike: () => toggleDocumentMark(strikeType) } };
+		return { commands: { toggleStrike: () => withRunFormattingLock(toggleDocumentMark(strikeType), (state) => {
+			const active = isMarkActive(state, strikeType);
+			return canonicalRunFormatting(state, {
+				strike: active ? null : true,
+				doubleStrike: null
+			});
+		}) } };
 	}
 });
 //#endregion

package/dist/prosemirror/extensions/marks/SubscriptExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Subscript Mark Extension
  */
-declare const SubscriptExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { SubscriptExtension };
+export declare const SubscriptExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -1,5 +1,6 @@
+import { canonicalRunFormatting } from "../../canonicalCommands.js";
 import { createMarkExtension } from "../create.js";
-import { toggleDocumentMark } from "./markUtils.js";
+import { isMarkActive, toggleDocumentMark, withRunFormattingLock } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/SubscriptExtension.ts
 /**
@@ -18,7 +19,7 @@ const SubscriptExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		const subscriptType = ctx.schema.marks["subscript"];
 		if (!subscriptType) panic("Missing mark type: subscript");
-		return { commands: { toggleSubscript: () => toggleDocumentMark(subscriptType) } };
+		return { commands: { toggleSubscript: () => withRunFormattingLock(toggleDocumentMark(subscriptType), (state) => canonicalRunFormatting(state, { vertAlign: isMarkActive(state, subscriptType) ? null : "subscript" })) } };
 	}
 });
 //#endregion

package/dist/prosemirror/extensions/marks/SuperscriptExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Superscript Mark Extension
  */
-declare const SuperscriptExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { SuperscriptExtension };
+export declare const SuperscriptExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -1,5 +1,6 @@
+import { canonicalRunFormatting } from "../../canonicalCommands.js";
 import { createMarkExtension } from "../create.js";
-import { toggleDocumentMark } from "./markUtils.js";
+import { isMarkActive, toggleDocumentMark, withRunFormattingLock } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/SuperscriptExtension.ts
 /**
@@ -18,7 +19,7 @@ const SuperscriptExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		const superscriptType = ctx.schema.marks["superscript"];
 		if (!superscriptType) panic("Missing mark type: superscript");
-		return { commands: { toggleSuperscript: () => toggleDocumentMark(superscriptType) } };
+		return { commands: { toggleSuperscript: () => withRunFormattingLock(toggleDocumentMark(superscriptType), (state) => canonicalRunFormatting(state, { vertAlign: isMarkActive(state, superscriptType) ? null : "superscript" })) } };
 	}
 });
 //#endregion

package/dist/prosemirror/extensions/marks/TextColorExtension.d.ts

@@ -3,6 +3,5 @@ import { MarkExtension } from "../types.js";
 /**
  * Text Color Mark Extension
  */
-declare const TextColorExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { TextColorExtension };
+export declare const TextColorExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -1,9 +1,9 @@
 import { textToStyle } from "../../../utils/formatToStyle.js";
 import { expectTextColorMarkAttrs } from "../../attrs/index.js";
-import { canonicalRunFormatting, withCanonicalCommand } from "../../canonicalCommands.js";
+import { canonicalRunFormatting } from "../../canonicalCommands.js";
 import { clearRunColor } from "../../clearRunColor.js";
 import { createMarkExtension } from "../create.js";
-import { setMark } from "./markUtils.js";
+import { setMark, withRunFormattingLock } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/TextColorExtension.ts
 /**
@@ -28,7 +28,8 @@ const TextColorExtension = createMarkExtension({
 			}
 		}],
 		toDOM(mark) {
-			const cssColor = textToStyle({ color: expectTextColorMarkAttrs(mark) }).color;
+			const colorAttrs = expectTextColorMarkAttrs(mark);
+			const cssColor = textToStyle({ color: colorAttrs }).color;
 			return [
 				"span",
 				{ style: typeof cssColor === "string" && cssColor ? `color: ${cssColor}` : "" },
@@ -41,10 +42,10 @@ const TextColorExtension = createMarkExtension({
 		if (!textColorType) panic("Missing mark type: textColor");
 		return { commands: {
 			setTextColor: (attrs) => {
-				if (!attrs.rgb && !attrs.themeColor) return withCanonicalCommand(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }));
-				return setMark(textColorType, attrs);
+				if (!attrs.rgb && !attrs.themeColor) return withRunFormattingLock(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }));
+				return withRunFormattingLock(setMark(textColorType, attrs), (state) => canonicalRunFormatting(state, { color: attrs }));
 			},
-			clearTextColor: () => withCanonicalCommand(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }))
+			clearTextColor: () => withRunFormattingLock(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }))
 		} };
 	}
 });

package/dist/prosemirror/extensions/marks/TextEffectExtension.d.ts

@@ -1,5 +1,4 @@
 import { MarkExtension } from "../types.js";
 //#region src/prosemirror/extensions/marks/TextEffectExtension.d.ts
-declare const TextEffectExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { TextEffectExtension };
+export declare const TextEffectExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

package/dist/prosemirror/extensions/marks/TextEffectsExtensions.d.ts

@@ -9,22 +9,21 @@ import { MarkExtension } from "../types.js";
 /**
  * Emboss — raised text effect via text-shadow
  */
-declare const EmbossExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const EmbossExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 /**
  * Imprint/Engrave — engraved text effect via text-shadow
  */
-declare const ImprintExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const ImprintExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 /**
  * Text Shadow (w:shadow) — subtle drop shadow on text
  */
-declare const TextShadowExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const TextShadowExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 /**
  * Emphasis Mark (w:em) — dot/circle/comma above/below text
  */
-declare const EmphasisMarkExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const EmphasisMarkExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 /**
  * Text Outline (w:outline) — outlined text with no fill
  */
-declare const TextOutlineExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { EmbossExtension, EmphasisMarkExtension, ImprintExtension, TextOutlineExtension, TextShadowExtension };
+export declare const TextOutlineExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion

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

@@ -92,10 +92,7 @@ const EmphasisMarkExtension = createMarkExtension({
 				case "circle":
 					emStyle = "filled circle";
 					break;
-				case "underDot":
-					emStyle = "filled dot";
-					break;
-				default: break;
+				case "underDot": emStyle = "filled dot";
 			}
 			const position = emType === "underDot" ? "under right" : "over right";
 			return [

package/dist/prosemirror/extensions/marks/TrackedChangeExtensions.d.ts

@@ -11,12 +11,12 @@ import { MarkExtension } from "../types.js";
  * Insertion mark — text added in tracked changes
  * Renders with per-author colored underline.
  */
-declare const InsertionExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const InsertionExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 /**
  * Deletion mark — text removed in tracked changes
  * Renders with per-author colored strikethrough.
  */
-declare const DeletionExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+export declare const DeletionExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 /**
  * Run property change — formatting changed while review tracking was active.
  *
@@ -24,6 +24,5 @@ declare const DeletionExtension: (options?: Partial<Record<string, unknown>> | u
  * this mark carries the previous run properties and revision metadata needed
  * to serialize, list, accept, and reject the change.
  */
-declare const RunPropertyChangeExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
-//#endregion
-export { DeletionExtension, InsertionExtension, RunPropertyChangeExtension };
+export declare const RunPropertyChangeExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion