remons-markdown-editor 1.0.0-beta.24 → 1.0.0-beta.25

package/dist/index.js

@@ -6,6 +6,7 @@ import { Decoration, EditorView as EditorView$1, ViewPlugin, WidgetType, keymap
 import { defaultKeymap, indentWithTab } from "@codemirror/commands";
 import { markdown } from "@codemirror/lang-markdown";
 import { oneDark } from "@codemirror/theme-one-dark";
+import { syntaxTree } from "@codemirror/language";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import RenderMarkdown, { initHighlighter, languagesCommon } from "remons-render-markdown";
 import "remons-render-markdown/dist/index.css";
@@ -405,6 +406,116 @@ function toggleLinePrefix(view, pattern, insertText) {
 	}
 	view.dispatch({ changes });
 }
+/** Markdown 列表行：缩进 + 列表标记（无序/有序）+ 空白 */
+var LIST_LINE_RE = /^(\s*)([-*+]|\d+\.)([ \t]+)/;
+/** 列表缩进台阶：4 个空格，确保缩进后能被解析为子列表 */
+var LIST_INDENT_WIDTH = 4;
+/** 判断位置是否位于代码块内（代码块内不参与列表缩进逻辑） */
+function isInCodeBlock(state, pos) {
+	let node = syntaxTree(state).resolveInner(pos, 1);
+	while (node) {
+		if (node.name === "FencedCode" || node.name === "CodeBlock") return true;
+		node = node.parent;
+	}
+	return false;
+}
+/**
+* 向上查找同缩进的前一个列表项，返回其序号
+* - 跳过更深的子列表行和空行
+* - 遇到非列表内容或更浅层列表时结束
+*/
+function findPrevSiblingOrder(state, plans, lineNo, indent) {
+	const doc = state.doc;
+	for (let n = lineNo - 1; n >= 1; n--) {
+		const plan = plans.get(n);
+		if (plan) {
+			if (plan.nextIndent === indent) return plan.nextOrder;
+			if (plan.nextIndent < indent) return null;
+			continue;
+		}
+		const text = doc.line(n).text;
+		if (!text.trim()) continue;
+		const m = text.match(LIST_LINE_RE);
+		if (!m) return null;
+		const lineIndent = m[1].length;
+		if (lineIndent === indent) return /^\d+\.$/.test(m[2]) ? parseInt(m[2], 10) : null;
+		if (lineIndent < indent) return null;
+	}
+	return null;
+}
+/**
+* 计算列表行缩进/反缩进的变更
+* - 仅当所有选区行都是列表行时生效，否则返回 null 交给默认缩进行为
+* - 有序列表缩进后重新编号，保证新一级子列表从 1 开始
+*/
+function planListIndent(view, direction) {
+	const { state } = view;
+	const doc = state.doc;
+	const plans = /* @__PURE__ */ new Map();
+	for (const range of state.selection.ranges) {
+		const first = doc.lineAt(range.from).number;
+		const last = doc.lineAt(range.to).number;
+		for (let n = first; n <= last; n++) {
+			if (plans.has(n)) continue;
+			const line = doc.line(n);
+			if (isInCodeBlock(state, line.from)) return null;
+			const m = line.text.match(LIST_LINE_RE);
+			if (!m) return null;
+			const indent = m[1].length;
+			plans.set(n, {
+				indent,
+				nextIndent: direction === 1 ? indent + LIST_INDENT_WIDTH : Math.max(0, indent - LIST_INDENT_WIDTH),
+				order: /^\d+\.$/.test(m[2]) ? parseInt(m[2], 10) : null,
+				nextOrder: null
+			});
+		}
+	}
+	if (plans.size === 0) return null;
+	const ordered = [...plans.entries()].sort((a, b) => a[0] - b[0]);
+	for (const [lineNo, info] of ordered) {
+		if (info.order === null) continue;
+		const prevOrder = findPrevSiblingOrder(state, plans, lineNo, info.nextIndent);
+		info.nextOrder = prevOrder === null ? 1 : prevOrder + 1;
+	}
+	return ordered.map(([lineNo, info]) => {
+		const line = doc.line(lineNo);
+		const m = line.text.match(LIST_LINE_RE);
+		const useNextOrder = (direction === 1 || info.indent > 0) && info.order !== null && info.nextOrder !== null && info.order !== info.nextOrder;
+		return {
+			from: line.from,
+			to: line.from + m[0].length,
+			insert: " ".repeat(info.nextIndent) + (useNextOrder ? `${info.nextOrder}.` : m[2]) + m[3]
+		};
+	});
+}
+/**
+* Tab：列表行缩进一级（4 空格）
+* - 普通行返回 false，继续走默认缩进
+* - 有序列表缩进后重排序号，子列表从 1 开始
+*/
+function indentMarkdownList(view) {
+	const changes = planListIndent(view, 1);
+	if (!changes) return false;
+	view.dispatch({
+		changes,
+		userEvent: "input.indent"
+	});
+	return true;
+}
+/**
+* Shift-Tab：列表行反缩进一级
+* - 普通行返回 false，继续走默认缩进
+* - 有序列表反缩进后并入上一层并重排序号
+*/
+function dedentMarkdownList(view) {
+	const changes = planListIndent(view, -1);
+	if (!changes) return false;
+	view.dispatch({
+		changes,
+		userEvent: "delete.dedent"
+	});
+	return true;
+}
 /**
 * 上传图片
 * @param file - 要上传的文件
@@ -552,7 +663,18 @@ var getCodeMirrorExtensions = (opts) => {
 	const extensions = [
 		markdown(),
 		oneDark,
-		keymap.of([...defaultKeymap, indentWithTab]),
+		keymap.of([
+			{
+				key: "Tab",
+				run: indentMarkdownList
+			},
+			{
+				key: "Shift-Tab",
+				run: dedentMarkdownList
+			},
+			...defaultKeymap,
+			indentWithTab
+		]),
 		EditorView$1.lineWrapping,
 		pasteHandler,
 		EditorView$1.baseTheme({
@@ -690,6 +812,8 @@ function Quote() {
 function InlineCode() {
 	return IconComponent("inlinecode");
 }
+/** 未配置图片上传时的提示文案 */
+var UPLOAD_CONFIG_MISSING_MESSAGE = "请先配置图片上传功能";
 /**
 * 创建工具栏配置
 * @param options - 配置选项
@@ -787,13 +911,9 @@ function createToolbarConfig(options) {
 		},
 		{
 			id: "image",
-			label: hasUploadConfig ? "图片" : "请配置图片上传地址",
+			label: "图片",
 			icon: PictureOutlined,
-			disabled: !hasUploadConfig,
-			handler: hasUploadConfig ? (v) => uploadImage(v, {
-				uploadUrl: options?.uploadUrl,
-				onUploadImage: options?.onUploadImage
-			}) : void 0
+			handler: hasUploadConfig && options ? (v) => uploadImage(v, options) : () => message.warning(UPLOAD_CONFIG_MISSING_MESSAGE)
 		},
 		{ separatorBefore: true },
 		{