@meowdown/core 0.67.0 → 0.67.2

package/dist/index.d.ts

@@ -319,6 +319,7 @@ interface PositionRange {
 //#endregion
 //#region src/extensions/get-link-unit-at.d.ts
 interface LinkUnitBase {
+  state: EditorState;
   /**
    * Whole inline link, reference link, or autolink range.
    */
@@ -382,7 +383,7 @@ export declare function normalizeHref(raw: string): string;
 /**
  * Get a link's plain visible text.
  */
-export declare function getLinkText(state: EditorState, link: LinkUnit): string;
+export declare function getLinkText(link: LinkUnit): string;
 /**
  * Whether plain visible link text names the same destination as the link.
  */

package/dist/index.js

@@ -190,7 +190,9 @@ function computeRevealDecorations(state, mode) {
 		});
 	}
 	if (ranges.length === 0) return;
-	const decorations = ranges.map((range) => Decoration.inline(range.from, range.to, { class: "show" }));
+	const decorations = ranges.map((range) => {
+		return Decoration.inline(range.from, range.to, { class: "show" });
+	});
 	return DecorationSet.create(state.doc, decorations);
 }
 function defineMarkMode(mode) {
@@ -962,11 +964,13 @@ function headingFromDOM() {
 		4,
 		5,
 		6
-	].map((level) => createSourceTextRule(`h${level}`, "heading", (dom) => ({
-		level,
-		setextUnderline: parsePositiveInteger(dom.getAttribute("data-setext-underline")) ?? null,
-		closingHashes: parsePositiveInteger(dom.getAttribute("data-closing-hashes")) ?? null
-	})));
+	].map((level) => {
+		return createSourceTextRule(`h${level}`, "heading", (dom) => ({
+			level,
+			setextUnderline: parsePositiveInteger(dom.getAttribute("data-setext-underline")) ?? null,
+			closingHashes: parsePositiveInteger(dom.getAttribute("data-closing-hashes")) ?? null
+		}));
+	});
 }
 function defineSetextUnderlineAttr() {
 	return defineNodeAttr({
@@ -4428,11 +4432,13 @@ function toggleInline(spec) {
 			return false;
 		});
 		const remove = segments.length > 0 && segments.every((segment) => segment.active);
-		const edits = segments.filter((segment) => remove || !segment.active).flatMap((segment) => toggleInlineEdits(segment.text, segment.from, segment.to, spec, remove).map((edit) => ({
-			from: edit.from + segment.base,
-			to: edit.to + segment.base,
-			insert: edit.insert
-		})));
+		const edits = segments.filter((segment) => remove || !segment.active).flatMap((segment) => {
+			return toggleInlineEdits(segment.text, segment.from, segment.to, spec, remove).map((edit) => ({
+				from: edit.from + segment.base,
+				to: edit.to + segment.base,
+				insert: edit.insert
+			}));
+		});
 		if (edits.length === 0) return false;
 		if (dispatch) {
 			const tr = state.tr;
@@ -4513,7 +4519,9 @@ function lastMarkRunIn(state, range, markName) {
 * the `mdLinkUri` run locates the `( )` body.
 */
 function getLinkUnitAt(state, pos) {
-	const unit = getMarkRangeAt(state, pos, "mdPack", (mark) => mark.attrs.key.startsWith("link-"));
+	const unit = getMarkRangeAt(state, pos, "mdPack", (mark) => {
+		return mark.attrs.key.startsWith("link-");
+	});
 	if (!unit) return;
 	const attrs = unit.mark.attrs;
 	const unitRange = {
@@ -4522,6 +4530,7 @@ function getLinkUnitAt(state, pos) {
 	};
 	switch (attrs.key) {
 		case "link-bare": return {
+			state,
 			form: "bare",
 			unit: unitRange,
 			text: unitRange,
@@ -4529,6 +4538,7 @@ function getLinkUnitAt(state, pos) {
 			title: ""
 		};
 		case "link-angle": return {
+			state,
 			form: "angle",
 			unit: unitRange,
 			text: {
@@ -4541,6 +4551,7 @@ function getLinkUnitAt(state, pos) {
 		case "link-reference": {
 			const linkText = getMarkRangeAt(state, pos, "mdLinkText");
 			return {
+				state,
 				form: "reference",
 				unit: unitRange,
 				text: linkText == null ? unitRange : {
@@ -4560,6 +4571,7 @@ function getLinkUnitAt(state, pos) {
 				to: closeBracket
 			};
 			return {
+				state,
 				form: "inline",
 				unit: unitRange,
 				text: label,
@@ -4613,8 +4625,8 @@ function getVisibleText(state, range) {
 /**
 * Get a link's plain visible text.
 */
-function getLinkText(state, link) {
-	return getVisibleText(state, link.text);
+function getLinkText(link) {
+	return getVisibleText(link.state, link.text);
 }
 /**
 * Whether plain visible link text names the same destination as the link.
@@ -4677,7 +4689,7 @@ function updateLink(attrs) {
 		if (!link || link.form === "reference") return false;
 		const href = normalizeHref(attrs.href ?? link.href);
 		const title = attrs.title ?? link.title;
-		const text = attrs.text ?? getLinkText(state, link);
+		const text = attrs.text ?? getLinkText(link);
 		const replacingUnit = attrs.text !== void 0 || link.form !== "inline";
 		if (dispatch) dispatch((replacingUnit ? state.tr.insertText(`[${linkLabelText(text)}](${destText(href, title)})`, link.unit.from, link.unit.to) : state.tr.insertText(destText(href, title), link.dest.from, link.dest.to)).scrollIntoView());
 		return true;
@@ -4691,7 +4703,7 @@ function removeLink() {
 		const link = getLinkUnitAt(state, state.selection.from);
 		if (!link || link.form === "reference") return false;
 		if (dispatch) {
-			const text = getLinkText(state, link);
+			const text = getLinkText(link);
 			dispatch((link.form === "inline" && !getAutolinkHref(text) ? state.tr.delete(link.label.to, link.unit.to).delete(link.unit.from, link.label.from) : state.tr.insertText(text + formatMagicComment({ noLink: true }), link.unit.from, link.unit.to)).scrollIntoView());
 		}
 		return true;
@@ -4717,7 +4729,7 @@ function openLinkEdit(onLinkEdit) {
 					from,
 					to,
 					link,
-					text: getLinkText(state, link)
+					text: getLinkText(link)
 				});
 			}
 			return true;
@@ -5733,7 +5745,8 @@ function tryCoordsAtPos(view, pos, side) {
 	let coords;
 	try {
 		coords = view.coordsAtPos(pos, side);
-	} catch {
+	} catch (error) {
+		console.warn(`[meowdown] Failed to get caret coords at pos ${pos}:`, error);
 		return;
 	}
 	return isPointRect(coords) ? void 0 : coords;
@@ -5754,9 +5767,12 @@ function findNativeCaretRect(view) {
 	if (!view.dom.contains(selection.anchorNode)) return void 0;
 	const range = selection.getRangeAt(0).cloneRange();
 	range.collapse(true);
+	return findLastRangeRect(range);
+}
+function findLastRangeRect(range) {
 	const rects = Array.from(range.getClientRects()).filter((rect) => rect.height > 0);
-	if (rects.length === 0) return void 0;
 	const rect = rects[rects.length - 1];
+	if (rect == null) return void 0;
 	return {
 		left: rect.left,
 		top: rect.top,
@@ -5769,18 +5785,35 @@ function findCoordsCaretRect(view) {
 	const runBefore = getHiddenRunBefore(state, head);
 	const runAfter = getHiddenRunAfter(state, head);
 	const afterLineBreak = isAfterLineBreak($head);
-	const preferredBeforeSide = runBefore == null && !afterLineBreak;
-	const probes = [[head, preferredBeforeSide], [head, !preferredBeforeSide]];
+	const previousLineTop = afterLineBreak ? tryCoordsAtPos(view, head, -1)?.top : void 0;
+	const probes = afterLineBreak ? [[head, false]] : [[head, runBefore == null], [head, runBefore != null]];
 	if (runBefore != null) probes.push([runBefore.from, true]);
 	if (runAfter != null) probes.push([runAfter.to, false]);
 	for (const [pos, beforeSide] of probes) {
 		const coords = tryCoordsAtPos(view, pos, beforeSide ? -1 : 1);
-		if (coords != null && coords.bottom > coords.top) return {
+		if (coords == null || coords.bottom <= coords.top) continue;
+		if (pos === head && previousLineTop != null && coords.top <= previousLineTop) continue;
+		return {
 			left: coords.left,
 			top: coords.top,
 			height: coords.bottom - coords.top
 		};
 	}
+	if (previousLineTop != null) {
+		const collapsed = findCollapsedRangeRect(view, head);
+		if (collapsed != null && collapsed.top > previousLineTop) return collapsed;
+	}
+}
+function findCollapsedRangeRect(view, pos) {
+	try {
+		const { node, offset } = view.domAtPos(pos, 0);
+		const range = view.dom.ownerDocument.createRange();
+		range.setStart(node, offset);
+		range.collapse(true);
+		return findLastRangeRect(range);
+	} catch {
+		return;
+	}
 }
 function findAtomCaretRect(view) {
 	const state = view.state;

package/dist/style.css

@@ -691,6 +691,10 @@
     display: contents;
   }
 
+  .ProseMirror .md-pack[data-key="noLink"] {
+    display: inline;
+  }
+
   .ProseMirror[data-mark-mode="hide"], .ProseMirror[data-mark-mode="focus"] {
     & .md-mark, & .md-link-uri, & .md-link-title {
       letter-spacing: 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.67.0",
+  "version": "0.67.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "remark-stringify": "^11.0.0",
     "unicode-by-name": "^0.2.0",
     "unified": "^11.0.5",
-    "@meowdown/markdown": "^0.67.0"
+    "@meowdown/markdown": "^0.67.2"
   },
   "devDependencies": {
     "@ocavue/tsconfig": "^0.7.1",
@@ -54,9 +54,9 @@
     "commonmark.json": "^0.31.0",
     "dedent": "^1.7.2",
     "diffable-html-snapshot": "^0.3.0",
-    "fast-check": "^4.9.0",
     "tsdown": "^0.23.0-beta.2",
     "vitest": "^4.1.11",
+    "vitest-browser-commands": "^0.4.1",
     "@meowdown/vitest": "0.0.0"
   },
   "publishConfig": {