@meowdown/core 0.72.0 → 0.72.1

package/dist/index.d.ts

@@ -1162,7 +1162,7 @@ declare function defineEditorExtensionImpl(options: EditorExtensionOptions): imp
       fenceLength?: number | null;
     };
   };
-}>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension]>, MeowdownHorizontalRuleExtension, import("@prosekit/core").Extension<{
+}>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension]>, MeowdownHorizontalRuleExtension, import("@prosekit/core").Extension<{
   Nodes: {
     htmlComment: MeowdownHTMLCommentAttrs;
   };
@@ -1226,7 +1226,7 @@ declare function defineEditorExtensionImpl(options: EditorExtensionOptions): imp
   Marks: {
     mdPack: MdPackAttrs;
   };
-}>]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, 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<{
+}>]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, 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").Union<readonly [import("@prosekit/core").Extension<{
   Commands: {
     insertSoftBreak: [];
   };
@@ -1409,7 +1409,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 'Shift-Enter': "Insert a line break, or leave a code block from its end";
   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";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Priority, Priority as Priority$1, createMarkBuilders, createNodeBuilders, defineBaseCommands, defineBaseKeymap, defineClipboardSerializer, defineCommands, defineHistory, defineKeymap, defineMarkSpec, defineMarkView, defineNodeAttr, defineNodeSpec, definePlugin, findMarkRange, getMarkRange, getMarkType, getNodeType, isAllSelection, isApple, isAtBlockStart, isNodeSelection, isTextSelection, setBlockType, toggleNode, union, unsetBlockType, withPriority, withPriority as withPriority$1, withSkipCodeBlock } from "@prosekit/core";
+import { Priority, Priority as Priority$1, createMarkBuilders, createNodeBuilders, defaultBlockAt, defineBaseCommands, defineBaseKeymap, defineClipboardSerializer, defineCommands, defineHistory, defineKeymap, defineMarkSpec, defineMarkView, defineNodeAttr, defineNodeSpec, definePlugin, findMarkRange, getMarkRange, getMarkType, getNodeType, isAllSelection, isApple, isAtBlockStart, isNodeSelection, isTextSelection, setBlockType, toggleNode, union, unsetBlockType, withPriority, withPriority as withPriority$1, withSkipCodeBlock } from "@prosekit/core";
 import { defineCodeBlock, defineCodeBlockHighlight, defineCodeBlockPreviewPlugin, isCodeBlockPreviewHiddenDecoration } from "@prosekit/extensions/code-block";
 import { definePlaceholder, definePlaceholder as definePlaceholder$1 } from "@prosekit/extensions/placeholder";
 import { NodeSelection, Plugin, PluginKey, Selection, TextSelection } from "@prosekit/pm/state";
@@ -602,6 +602,41 @@ function defineBulletAfterHeading(enabled) {
 	} }), Priority$1.high);
 }
 
+//#endregion
+//#region src/extensions/click-below.ts
+const clickBelowKey = new PluginKey("meowdown-click-below");
+function acceptsCaretAtEnd(node) {
+	return node.isTextblock && !node.type.spec.code;
+}
+function handleMouseDown(view, event) {
+	if (event.target !== view.dom) return false;
+	if (event.button !== 0 || !view.editable) return false;
+	const { doc } = view.state;
+	const lastBlock = doc.lastChild;
+	if (!lastBlock || acceptsCaretAtEnd(lastBlock)) return false;
+	const lastBlockDOM = view.nodeDOM(doc.content.size - lastBlock.nodeSize);
+	if (!(lastBlockDOM instanceof HTMLElement)) return false;
+	if (event.clientY <= lastBlockDOM.getBoundingClientRect().bottom) return false;
+	const block = defaultBlockAt(doc.contentMatchAt(doc.childCount))?.createAndFill();
+	if (!block) return false;
+	event.preventDefault();
+	const end = doc.content.size;
+	const tr = view.state.tr.insert(end, block);
+	view.dispatch(tr.setSelection(TextSelection.create(tr.doc, end + 1)).scrollIntoView());
+	view.focus();
+	return true;
+}
+/**
+* A press below the last block appends an empty paragraph and puts the caret
+* in it, when that block would otherwise keep the caret inside itself.
+*/
+function defineClickBelow() {
+	return definePlugin(new Plugin({
+		key: clickBelowKey,
+		props: { handleDOMEvents: { mousedown: handleMouseDown } }
+	}));
+}
+
 //#endregion
 //#region src/converters/html-to-md.ts
 /**
@@ -2222,6 +2257,38 @@ function getCodeTokens(code, language) {
 	return loadLanguageSupport(trimmed).then((loaded) => loaded ? tokenize(code, loaded) : []);
 }
 
+//#endregion
+//#region src/extensions/code-block-exit.ts
+/**
+* With the caret at the end of a code block, move it into the block below when
+* that block is an empty paragraph, and into a new default block otherwise.
+*/
+const exitCodeBlockAtEnd = (state, dispatch) => {
+	const { $head, empty } = state.selection;
+	if (!empty) return false;
+	const codeBlock = $head.parent;
+	if (!codeBlock.type.spec.code || $head.parentOffset !== codeBlock.content.size) return false;
+	const container = $head.node(-1);
+	const indexAfter = $head.indexAfter(-1);
+	const after = $head.after();
+	const next = container.maybeChild(indexAfter);
+	if (next && isNodeOfType(next, "paragraph") && next.content.size === 0) {
+		dispatch?.(state.tr.setSelection(TextSelection.create(state.doc, after + 1)).scrollIntoView());
+		return true;
+	}
+	const type = defaultBlockAt(container.contentMatchAt(indexAfter));
+	const block = type?.createAndFill();
+	if (!type || !block || !container.canReplaceWith(indexAfter, indexAfter, type)) return false;
+	if (dispatch) {
+		const tr = state.tr.insert(after, block);
+		dispatch(tr.setSelection(TextSelection.create(tr.doc, after + 1)).scrollIntoView());
+	}
+	return true;
+};
+function defineCodeBlockExitKeymap() {
+	return defineKeymap({ "Mod-Enter": exitCodeBlockAtEnd });
+}
+
 //#endregion
 //#region src/extensions/code-block.ts
 function defineFenceStyleAttr() {
@@ -2279,7 +2346,7 @@ function defineDollarFenceEnterRule() {
 	});
 }
 function defineCodeBlock$1() {
-	return union(defineCodeBlock(), defineFenceStyleAttr(), defineFenceLengthAttr(), defineTildeFenceInputRule(), defineTildeFenceEnterRule(), defineDollarFenceEnterRule());
+	return union(defineCodeBlock(), defineFenceStyleAttr(), defineFenceLengthAttr(), defineTildeFenceInputRule(), defineTildeFenceEnterRule(), defineDollarFenceEnterRule(), defineCodeBlockExitKeymap());
 }
 
 //#endregion
@@ -7288,7 +7355,7 @@ function insertSoftBreak() {
 	return softBreakCommand;
 }
 function defineSoftBreak() {
-	return union(defineCommands({ insertSoftBreak }), defineKeymap({ "Shift-Enter": softBreakCommand }));
+	return union(defineCommands({ insertSoftBreak }), defineKeymap({ "Shift-Enter": chainCommands(exitCodeBlockAtEnd, softBreakCommand) }));
 }
 
 //#endregion
@@ -7547,7 +7614,7 @@ function defineEditorExtensionImpl(options) {
 		if (editorClassName) attributes.class += ` ${editorClassName}`;
 		if (spellCheck != null) attributes.spellcheck = String(spellCheck);
 		return attributes;
-	}), defineCodeBlockSyntaxHighlight(), defineCrossEditorDrag(), defineEscapeCollapse(), defineSoftBreak(), defineMoveBlock(), defineSelectDocBoundary(), defineInlineMarkPlugin(getEditorConfig), defineInlineToggle(), defineLinkCommands(), defineWikilink(), defineMath(), defineMarkMode(getMarkMode), defineClipboard(), defineScrollToSelection(), defineHiddenRunCaret(), defineSystemSubstitutionGuard(), defineAtomMarkNavigation({ marks: ATOM_SOURCE_MARK_NAMES.map((name) => ({
+	}), defineCodeBlockSyntaxHighlight(), defineCrossEditorDrag(), defineClickBelow(), defineEscapeCollapse(), defineSoftBreak(), defineMoveBlock(), defineSelectDocBoundary(), defineInlineMarkPlugin(getEditorConfig), defineInlineToggle(), defineLinkCommands(), defineWikilink(), defineMath(), defineMarkMode(getMarkMode), defineClipboard(), defineScrollToSelection(), defineHiddenRunCaret(), defineSystemSubstitutionGuard(), defineAtomMarkNavigation({ marks: ATOM_SOURCE_MARK_NAMES.map((name) => ({
 		name,
 		modes: [
 			"hide",
@@ -8340,7 +8407,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",
+	"Shift-Enter": "Insert a line break, or leave a code block from its end",
 	"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",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.72.0",
+  "version": "0.72.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,6 +25,7 @@
     "@codemirror/language-data": "^6.5.2",
     "@floating-ui/dom": "^1.8.0",
     "@lezer/highlight": "^1.2.3",
+    "@meowdown/markdown": "^0.72.0",
     "@ocavue/utils": "^1.8.0",
     "@post-embed/elements": "^0.5.0",
     "@post-embed/exporter": "^0.4.1",
@@ -48,10 +49,10 @@
     "remark-stringify": "^11.0.0",
     "unicode-by-name": "^0.2.0",
     "unified": "^11.0.5",
-    "valibot": "^1.5.0",
-    "@meowdown/markdown": "^0.72.0"
+    "valibot": "^1.5.0"
   },
   "devDependencies": {
+    "@meowdown/vitest": "0.0.0",
     "@ocavue/tsconfig": "^0.7.1",
     "@tsdown/css": "^0.23.0",
     "@types/hast": "^3.0.5",
@@ -61,9 +62,7 @@
     "dedent": "^1.7.2",
     "diffable-html-snapshot": "^0.3.0",
     "tsdown": "^0.23.0",
-    "vitest": "^5.0.1",
-    "vitest-browser-commands": "^0.4.1",
-    "@meowdown/vitest": "0.0.0"
+    "vitest": "^5.0.1"
   },
   "publishConfig": {
     "access": "public"