@meowdown/core 0.65.6 → 0.66.0

package/README.md

@@ -60,6 +60,7 @@ the current block to that level (or back to a paragraph).
 | `Mod-5`                | Heading 5                                                 | `##### heading`     |
 | `Mod-6`                | Heading 6                                                 | `###### heading`    |
 | `Mod-.`                | Fold or unfold a bullet                                   |                     |
+| `Shift-Enter`          | Insert a line break                                       |                     |
 | `Mod-Enter`            | Follow the link under the caret, or cycle a checkbox task | `- [ ]` / `- [x]`   |
 | `Mod-Shift-Enter`      | Cycle a circle checkbox task                              | `+ [ ]` / `+ [x]`   |
 | `Mod-Shift-7`          | Ordered list                                              | `1. item`           |

package/dist/index.d.ts

@@ -793,7 +793,11 @@ declare function defineEditorExtensionImpl(options: EditorExtensionOptions): imp
   Marks: {
     mdPack: MdPackAttrs;
   };
-}>]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").Extension<import("@prosekit/core").ExtensionTyping<any, any, any>>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").Union<readonly [import("@prosekit/core").Extension<{
+}>]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").Extension<import("@prosekit/core").ExtensionTyping<any, any, any>>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").Union<readonly [import("@prosekit/core").Extension<{
+  Commands: {
+    insertSoftBreak: [];
+  };
+}>, import("@prosekit/core").PlainExtension]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").Union<readonly [import("@prosekit/core").Extension<{
   Commands: {
     toggleEm: [];
     toggleStrong: [];
@@ -1337,6 +1341,7 @@ export declare const EDITOR_KEY_BINDINGS: {
   readonly 'Mod-5': "Heading 5";
   readonly 'Mod-6': "Heading 6";
   readonly 'Mod-.': "Fold or unfold a bullet";
+  readonly 'Shift-Enter': "Insert a line break";
   readonly 'Mod-Enter': "Follow the link under the caret, or cycle a checkbox task";
   readonly 'Mod-Shift-Enter': "Cycle a circle checkbox task";
   readonly 'Mod-Shift-7': "Ordered list";
@@ -1396,12 +1401,6 @@ declare const NODE_NAMES: readonly ["doc", "text", "paragraph", "heading", "bloc
 type NodeName = (typeof NODE_NAMES)[number];
 export declare function isNodeOfType(node: ProseMirrorNode, name: NodeName): boolean;
 //#endregion
-//#region src/extensions/spell-check.d.ts
-/**
- * @deprecated This will be removed in future versions.
- */
-export declare function defineSpellCheckPlugin(spellCheck: boolean): PlainExtension;
-//#endregion
 //#region src/extensions/substitution.d.ts
 /**
  * Apply the editor's automatic plain-text substitutions.

package/dist/index.js

@@ -32,12 +32,12 @@ import { defineEnterRule, defineTextBlockEnterRule } from "@prosekit/extensions/
 import { defineInputRule, defineTextBlockInputRule } from "@prosekit/extensions/input-rule";
 import { triggerAutocomplete } from "@prosekit/extensions/autocomplete";
 import { defineListCommands, defineListDropIndicator, defineListKeymap, defineListSpec, moveList, toggleList, unwrapList, wrapInList } from "@prosekit/extensions/list";
-import { chainCommands, lift } from "@prosekit/pm/commands";
+import { chainCommands, lift, newlineInCode, splitBlock } from "@prosekit/pm/commands";
 import { defineHorizontalRule } from "@prosekit/extensions/horizontal-rule";
-import { AddMarkStep, AddNodeMarkStep, AttrStep, RemoveMarkStep, RemoveNodeMarkStep, ReplaceStep, Step, StepResult, Transform } from "@prosekit/pm/transform";
+import { AttrStep, ReplaceStep, Step, StepResult, Transform } from "@prosekit/pm/transform";
 import { decodeString } from "micromark-util-decode-string";
 import { normalizeIdentifier } from "micromark-util-normalize-identifier";
-import { createListRenderingPlugin, createSafariInputMethodWorkaroundPlugin, createToggleCollapsedCommand, defaultAttributesGetter, findCheckboxInListItem, handleListMarkerMouseDown, joinListElements, listToDOM, unwrapListSlice, wrappingListInputRule } from "prosemirror-flat-list";
+import { createListRenderingPlugin, createSafariInputMethodWorkaroundPlugin, createToggleCollapsedCommand, defaultAttributesGetter, enterCommand, findCheckboxInListItem, handleListMarkerMouseDown, joinListElements, listToDOM, unwrapListSlice, wrappingListInputRule } from "prosemirror-flat-list";
 import { defineTableCellSpec, defineTableCommands, defineTableDropIndicator, defineTableEditingPlugin, defineTableHeaderCellSpec, defineTableRowSpec, defineTableSpec, deleteTable, isCellSelection } from "@prosekit/extensions/table";
 import { closeHistory } from "@prosekit/pm/history";
 import { registerResizableHandleElement, registerResizableRootElement } from "@prosekit/web/resizable";
@@ -5672,6 +5672,13 @@ function tryCoordsAtPos(view, pos, side) {
 	return isPointRect(coords) ? void 0 : coords;
 }
 
+//#endregion
+//#region src/utils/line-break.ts
+function isAfterLineBreak($pos) {
+	const { parentOffset, parent } = $pos;
+	return parentOffset > 0 && parent.textBetween(parentOffset - 1, parentOffset) === "\n";
+}
+
 //#endregion
 //#region src/extensions/caret-rect.ts
 function findNativeCaretRect(view) {
@@ -5691,11 +5698,10 @@ function findNativeCaretRect(view) {
 }
 function findCoordsCaretRect(view) {
 	const state = view.state;
-	const head = state.selection.head;
+	const { head, $head } = state.selection;
 	const runBefore = getHiddenRunBefore(state, head);
 	const runAfter = getHiddenRunAfter(state, head);
-	const $head = state.doc.resolve(head);
-	const afterLineBreak = $head.parentOffset > 0 && $head.parent.textBetween($head.parentOffset - 1, $head.parentOffset) === "\n";
+	const afterLineBreak = isAfterLineBreak($head);
 	const preferredBeforeSide = runBefore == null && !afterLineBreak;
 	const probes = [[head, preferredBeforeSide], [head, !preferredBeforeSide]];
 	if (runBefore != null) probes.push([runBefore.from, true]);
@@ -5891,6 +5897,55 @@ function defineSelectDocBoundary() {
 	});
 }
 
+//#endregion
+//#region src/extensions/soft-break.ts
+function canHoldSoftBreak($pos) {
+	if (!isNodeOfType($pos.parent, "paragraph")) return false;
+	const container = $pos.depth > 0 ? $pos.node($pos.depth - 1) : void 0;
+	if (container == null) return true;
+	return !isNodeOfType(container, "tableCell") && !isNodeOfType(container, "tableHeaderCell");
+}
+const splitBlockOnEnter = chainCommands(enterCommand, splitBlock);
+function isBeforeLineBreak($pos) {
+	const { parentOffset, parent } = $pos;
+	return parentOffset < parent.content.size && parent.textBetween(parentOffset, parentOffset + 1) === "\n";
+}
+const splitPendingSoftBreak = (state, dispatch, view) => {
+	const { $from, empty } = state.selection;
+	if (!empty || !canHoldSoftBreak($from)) return false;
+	const inFront = isAfterLineBreak($from);
+	if (!inFront && !isBeforeLineBreak($from)) return false;
+	let split;
+	if (!splitBlockOnEnter(state, (candidate) => {
+		split = candidate;
+	}, view) || split == null) return false;
+	if (dispatch == null) return true;
+	const start = inFront ? $from.pos - 1 : $from.pos;
+	const side = inFront ? -1 : 1;
+	const from = split.mapping.map(start, side);
+	const to = split.mapping.map(start + 1, side);
+	dispatch(split.delete(from, to).scrollIntoView());
+	return true;
+};
+const insertSoftBreakText = (state, dispatch) => {
+	if (!canHoldSoftBreak(state.selection.$from)) return false;
+	dispatch?.(state.tr.insertText("\n").scrollIntoView());
+	return true;
+};
+const softBreakCommand = chainCommands(newlineInCode, splitPendingSoftBreak, insertSoftBreakText);
+/**
+* Insert a markdown soft line break at the caret: a literal `\n` in the
+* paragraph's text. In a code block it writes the newline plain Enter writes
+* there. On a caret that already sits beside a soft break it splits the block
+* instead, because a paragraph cannot hold a blank line.
+*/
+function insertSoftBreak() {
+	return softBreakCommand;
+}
+function defineSoftBreak() {
+	return union(defineCommands({ insertSoftBreak }), defineKeymap({ "Shift-Enter": softBreakCommand }));
+}
+
 //#endregion
 //#region src/extensions/system-substitution-guard.ts
 const EM_DASH = "—";
@@ -5932,7 +5987,7 @@ function defineViewAttributes(attributes) {
 //#endregion
 //#region src/extensions/extension.ts
 function defineEditorExtensionImpl(options) {
-	return union(defineMeowdownParagraph(), defineDoc(), defineDocFrontmatterAttr(), defineText(), defineBlockquote(), defineMeowdownList(), defineHeading(), defineTable(), defineCodeBlock$1(), defineMeowdownHorizontalRule(), defineHTMLComment(), defineInlineMarks(), defineViewAttributes({ class: "meowdown-content" }), defineCodeBlockSyntaxHighlight(), defineCrossEditorDrag(), defineEscapeCollapse(), defineMoveBlock(), defineSelectDocBoundary(), defineInlineMarkPlugin(options), defineInlineToggle(), defineLinkCommands(), defineWikilink(), defineMath(), defineMarkMode(options.markMode ?? "focus"), defineClipboard(), defineScrollToSelection(), defineHiddenRunCaret(), defineSystemSubstitutionGuard(), defineAtomMarkNavigation({ marks: ATOM_SOURCE_MARK_NAMES.map((name) => ({
+	return union(defineMeowdownParagraph(), defineDoc(), defineDocFrontmatterAttr(), defineText(), defineBlockquote(), defineMeowdownList(), defineHeading(), defineTable(), defineCodeBlock$1(), defineMeowdownHorizontalRule(), defineHTMLComment(), defineInlineMarks(), defineViewAttributes({ class: "meowdown-content" }), defineCodeBlockSyntaxHighlight(), defineCrossEditorDrag(), defineEscapeCollapse(), defineSoftBreak(), defineMoveBlock(), defineSelectDocBoundary(), defineInlineMarkPlugin(options), defineInlineToggle(), defineLinkCommands(), defineWikilink(), defineMath(), defineMarkMode(options.markMode ?? "focus"), defineClipboard(), defineScrollToSelection(), defineHiddenRunCaret(), defineSystemSubstitutionGuard(), defineAtomMarkNavigation({ marks: ATOM_SOURCE_MARK_NAMES.map((name) => ({
 		name,
 		modes: [
 			"hide",
@@ -7885,6 +7940,7 @@ const EDITOR_KEY_BINDINGS = {
 	"Mod-5": "Heading 5",
 	"Mod-6": "Heading 6",
 	"Mod-.": "Fold or unfold a bullet",
+	"Shift-Enter": "Insert a line break",
 	"Mod-Enter": "Follow the link under the caret, or cycle a checkbox task",
 	"Mod-Shift-Enter": "Cycle a circle checkbox task",
 	"Mod-Shift-7": "Ordered list",
@@ -8054,98 +8110,6 @@ function defineLinkPaste() {
 	})), Priority$1.high);
 }
 
-//#endregion
-//#region src/utils/is-mark-step.ts
-function isMarkStep(step) {
-	return step instanceof AddMarkStep || step instanceof AddNodeMarkStep || step instanceof RemoveMarkStep || step instanceof RemoveNodeMarkStep || step instanceof BatchSetMarkStep;
-}
-
-//#endregion
-//#region src/extensions/spell-check.ts
-const SPELL_CHECK_PAUSE_TIMEOUT = 1200;
-function hasContentChanged(transactions) {
-	for (const tr of transactions) for (const step of tr.steps) if (!isMarkStep(step)) return true;
-	return false;
-}
-/**
-* Stop macOS from rewriting straight punctuation into "smart" punctuation as
-* the user types.
-*
-* On macOS, WebKit applies the system "smart quotes and dashes" substitution
-* inside `contenteditable` when `spellcheck` is true. Typing right after the hidden
-* `<!-- {"width":..,"height":..} -->` sizing comment that backs an image lets
-* it rewrite the `--` in `-->` into an em dash. which invalidates the comment so
-* meowdown can no longer parse it and it leaks into the note as literal text.
-*
-* We disable the `spellcheck` attribute for a few seconds before any doc
-* change transaction. This would prevent the smart punctuation substitution from happening.
-*/
-function createSpellCheckPluginState(spellCheck) {
-	let view;
-	let timeoutId;
-	let paused = false;
-	let currentValue;
-	const update = () => {
-		const dom = view && !view.isDestroyed && view.dom;
-		if (!dom) return;
-		const newValue = spellCheck && !paused;
-		if (newValue !== currentValue) {
-			currentValue = newValue;
-			dom.spellcheck = newValue;
-		}
-	};
-	const pause = () => {
-		if (timeoutId) clearTimeout(timeoutId);
-		paused = true;
-		update();
-		timeoutId = setTimeout(() => {
-			paused = false;
-			update();
-		}, SPELL_CHECK_PAUSE_TIMEOUT);
-	};
-	return {
-		pause,
-		apply(transactions) {
-			if (hasContentChanged(transactions)) pause();
-		},
-		view(editorView) {
-			view = editorView;
-			return { destroy() {
-				view = void 0;
-			} };
-		}
-	};
-}
-function createSpellCheckPlugin(spellCheck) {
-	const spellCheckKey = new PluginKey("spell-check");
-	return new Plugin({
-		key: spellCheckKey,
-		state: {
-			init: () => {
-				return createSpellCheckPluginState(spellCheck);
-			},
-			apply: (tr, pluginState) => {
-				return pluginState;
-			}
-		},
-		view(view) {
-			return spellCheckKey.getState(view.state)?.view(view) || {};
-		},
-		props: { handleDOMEvents: { beforeinput: (view) => {
-			spellCheckKey.getState(view.state)?.pause();
-		} } },
-		appendTransaction(transactions, state) {
-			spellCheckKey.getState(state)?.apply(transactions);
-		}
-	});
-}
-/**
-* @deprecated This will be removed in future versions.
-*/
-function defineSpellCheckPlugin(spellCheck) {
-	return definePlugin(createSpellCheckPlugin(spellCheck));
-}
-
 //#endregion
 //#region src/extensions/substitution.ts
 const SUBSTITUTION_RULES = [
@@ -8395,7 +8359,7 @@ var VirtualCaretView = class {
 			this.#renderCaret();
 			return;
 		}
-		const nativeRect = findNativeCaretRect(view);
+		const nativeRect = isAfterLineBreak(selection.$head) ? void 0 : findNativeCaretRect(view);
 		if (nativeRect && getIsTouchInput()) {
 			this.#renderTail();
 			this.#renderCaret();
@@ -8647,4 +8611,4 @@ function getVirtualElementFromRange(view, range) {
 }
 
 //#endregion
-export { EDITOR_KEY_BINDINGS, Priority, buildFileMarkdown, checkRoundTrip, codeBlockLanguages, collectReferenceDefinitions, defaultResolveImageUrl, defineBulletAfterHeading, defineCodeBlockPreviewPlugin, defineCodeBlockSyntaxHighlight, defineEditorExtension, defineEmbedPaste, defineExitBoundaryHandler, defineFileClickHandler, defineFilePaste, defineFileView, defineFollowLinkHandler, defineHTMLComment, defineImage, defineImageClickHandler, defineLinkClickHandler, defineLinkCommands, defineLinkEditKeymap, defineLinkHoverHandler, defineLinkPaste, defineMath, definePendingReplacementHandler, definePlaceholder, defineReadonly, defineSearchStatusHandler, defineSpellCheckPlugin, defineSubstitution, defineTagClickHandler, defineViewAttributes, defineVirtualCaret, defineWikilinkClickHandler, defineWikilinkHoverHandler, defineWikilinkTrigger, docToMarkdown, formatFileSize, formatSizedWikiEmbed, getCodeTokens, getFileKind, getIsComposing, getLinkUnitAt, getMarkBuilders, getPendingReplacement, getSearchStatus, getSelectedText, getTableColumnAlign, getTextblockDisplayText, getVirtualElementFromRange, inlineTextToMarkChunks, inlineTextToMarkChunksWithContext, insertLink, isCodeBlockPreviewHiddenDecoration, isMarkOfType, isModEvent, isNodeOfType, isSelectionInTableCell, listenForTweetHeight, loadKaTeX, markdownToDoc, matchEmbed, parseWikiEmbed, removeLink, renderMathInto, updateLink, wikiEmbedBasename, withPriority };
+export { EDITOR_KEY_BINDINGS, Priority, buildFileMarkdown, checkRoundTrip, codeBlockLanguages, collectReferenceDefinitions, defaultResolveImageUrl, defineBulletAfterHeading, defineCodeBlockPreviewPlugin, defineCodeBlockSyntaxHighlight, defineEditorExtension, defineEmbedPaste, defineExitBoundaryHandler, defineFileClickHandler, defineFilePaste, defineFileView, defineFollowLinkHandler, defineHTMLComment, defineImage, defineImageClickHandler, defineLinkClickHandler, defineLinkCommands, defineLinkEditKeymap, defineLinkHoverHandler, defineLinkPaste, defineMath, definePendingReplacementHandler, definePlaceholder, defineReadonly, defineSearchStatusHandler, defineSubstitution, defineTagClickHandler, defineViewAttributes, defineVirtualCaret, defineWikilinkClickHandler, defineWikilinkHoverHandler, defineWikilinkTrigger, docToMarkdown, formatFileSize, formatSizedWikiEmbed, getCodeTokens, getFileKind, getIsComposing, getLinkUnitAt, getMarkBuilders, getPendingReplacement, getSearchStatus, getSelectedText, getTableColumnAlign, getTextblockDisplayText, getVirtualElementFromRange, inlineTextToMarkChunks, inlineTextToMarkChunksWithContext, insertLink, isCodeBlockPreviewHiddenDecoration, isMarkOfType, isModEvent, isNodeOfType, isSelectionInTableCell, listenForTweetHeight, loadKaTeX, markdownToDoc, matchEmbed, parseWikiEmbed, removeLink, renderMathInto, updateLink, wikiEmbedBasename, withPriority };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.65.6",
+  "version": "0.66.0",
   "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.65.6"
+    "@meowdown/markdown": "^0.66.0"
   },
   "devDependencies": {
     "@ocavue/tsconfig": "^0.7.1",