remons-markdown-editor 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/components/Dialog/EditDialog.d.ts

@@ -9,6 +9,8 @@ interface EditDialogProps {
     typeName: string;
     /** 当前属性值 */
     currentProps: ContainerProps;
+    /** 每次打开递增的序号：作为 Form 的 key，切换容器时触发重挂载重新取 initialValues */
+    initKey: number;
     /** 保存回调 */
     onSave: (props: ContainerProps) => void;
     /** 关闭回调 */
@@ -18,5 +20,5 @@ interface EditDialogProps {
  * 属性编辑弹窗组件
  * 根据组件 schema 的 renderDialog 函数渲染弹窗内容
  */
-export default function EditDialog({ visible, typeName, currentProps, onSave, onClose }: EditDialogProps): import('react').JSX.Element | null;
+export default function EditDialog({ visible, typeName, currentProps, initKey, onSave, onClose }: EditDialogProps): import('react').JSX.Element | null;
 export {};

package/dist/components/Editor/containerWidget.d.ts

@@ -1,6 +1,14 @@
 import { ViewPlugin, EditorView, DecorationSet } from '@codemirror/view';
-import { EditorState, Facet } from '@codemirror/state';
+import { EditorState, Facet, Transaction } from '@codemirror/state';
 import { ContainerBlock } from '../../utils/parseContainer';
+/**
+ * 唤醒容器装饰重建的状态 effect（不改变文档）。
+ * 编辑按钮是否展示取决于容器类型是否已注册，而宿主常在编辑器挂载之后才
+ * 通过 useRegisterToolbar 异步注册 schema；注册不是 CodeMirror 事务，默认不会触发
+ * ViewPlugin.update，导致初始化时烘焙的 registered=false 无法刷新（需手动改一个字才出现）。
+ * 宿主在注册中心版本变化时 dispatch 本 effect，驱动插件重新求值 registered。
+ */
+export declare const refreshContainers: import('@codemirror/state').StateEffectType<null>;
 /**
  * 编辑容器属性的回调函数类型
  * @param view 当前编辑器实例
@@ -18,8 +26,11 @@ export declare const containerEditCallback: Facet<OnEditContainer, OnEditContain
  */
 export declare const containerWidgetPlugin: ViewPlugin<{
     decorations: DecorationSet;
+    /** 上次构建装饰时的注册中心版本，用于感知异步注册（不能标 private，否则导出匿名类的 dts 报 TS4094） */
+    registryVersion: number;
     update(update: {
         docChanged: boolean;
         state: EditorState;
+        transactions: readonly Transaction[];
     }): void;
 }, undefined>;

package/dist/index.cjs

@@ -1278,8 +1278,25 @@ function parseContainerProps(line) {
 	}
 }
 /**
+* 解析行首的引用（blockquote）嵌套前缀。
+* markdown-it 解析引用内部内容时会剥掉一层 "> "，因此 "> :::badge" 在渲染侧
+* 等同于 ":::badge"；编辑器侧需同样识别，否则嵌套引用的容器匹配不到标签。
+* 返回 [前缀文本（含 "> " 及尾随空格）, 去掉前缀后的内容]，无前缀时返回 ['', 原文本]。
+*/
+function splitQuotePrefix(line) {
+	const m = line.match(/^((?:>\s*)+)(\S.*)$/);
+	if (!m) return ["", line];
+	return [m[1], m[2]];
+}
+/** 引用嵌套深度（"> > x" 为 2，无前缀为 0） */
+function quoteDepth(prefix) {
+	return (prefix.match(/>/g) ?? []).length;
+}
+/**
 * 在编辑器文档中查找容器块。
 * 单次遍历 + 预累计行偏移，复杂度 O(行数)。
+* 支持整体嵌套在引用中的容器：头行、属性行、闭合行需具有相同的 "> " 前缀深度，
+* 避免跨引用层级错误配对。闭合 ::: 改为按栈配对，嵌套容器不会被内层闭合误截断。
 */
 function findContainers(docText) {
 	const containers = [];
@@ -1290,34 +1307,53 @@ function findContainers(docText) {
 		offsets[i] = pos;
 		pos += lines[i].length + 1;
 	}
+	const stack = [];
 	for (let i = 0; i < lines.length; i++) {
-		const match = lines[i].match(/^:::(\w+)$/);
+		const [prefix, body] = splitQuotePrefix(lines[i]);
+		const depth = quoteDepth(prefix);
+		if (/^:::$/.test(body)) {
+			let top = stack.length - 1;
+			while (top >= 0 && stack[top].depth !== depth) top--;
+			if (top >= 0) {
+				stack[top].block.endPos = offsets[i];
+				stack.length = top;
+			}
+			continue;
+		}
+		const match = body.match(/^:::(\w+)$/);
 		if (!match) continue;
 		const typeName = match[1];
 		const headerPos = offsets[i];
 		let props = {};
 		let propsLineFrom = 0;
 		let propsLineTo = 0;
-		const propsLine = lines[i + 1];
-		if (propsLine && propsLine.trim().startsWith("{") && propsLine.trim().endsWith("}")) {
-			props = parseContainerProps(propsLine);
-			propsLineFrom = offsets[i + 1];
-			propsLineTo = propsLineFrom + propsLine.length;
-		}
-		let endPos = 0;
-		for (let j = i + 1; j < lines.length; j++) if (lines[j].trim() === ":::") {
-			endPos = offsets[j];
-			i = j;
-			break;
+		let propsQuotePrefix = "";
+		const nextLine = lines[i + 1];
+		if (nextLine) {
+			const [nextPrefix, nextBody] = splitQuotePrefix(nextLine);
+			if ((quoteDepth(nextPrefix) === depth || nextPrefix === "") && nextBody.trimStart().startsWith("{") && nextBody.trimEnd().endsWith("}")) {
+				props = parseContainerProps(nextBody);
+				propsLineFrom = offsets[i + 1];
+				propsLineTo = propsLineFrom + nextLine.length;
+				propsQuotePrefix = nextPrefix;
+				i += 1;
+			}
 		}
-		containers.push({
+		const block = {
 			startPos: headerPos,
 			typeName,
 			propsLineFrom,
 			propsLineTo,
 			props,
-			endPos,
-			registered: componentRegistry.has(typeName)
+			endPos: 0,
+			registered: componentRegistry.has(typeName),
+			quotePrefix: prefix,
+			propsQuotePrefix
+		};
+		containers.push(block);
+		stack.push({
+			block,
+			depth
 		});
 	}
 	return containers;
@@ -1325,6 +1361,14 @@ function findContainers(docText) {
 //#endregion
 //#region src/components/Editor/containerWidget.ts
 /**
+* 唤醒容器装饰重建的状态 effect（不改变文档）。
+* 编辑按钮是否展示取决于容器类型是否已注册，而宿主常在编辑器挂载之后才
+* 通过 useRegisterToolbar 异步注册 schema；注册不是 CodeMirror 事务，默认不会触发
+* ViewPlugin.update，导致初始化时烘焙的 registered=false 无法刷新（需手动改一个字才出现）。
+* 宿主在注册中心版本变化时 dispatch 本 effect，驱动插件重新求值 registered。
+*/
+var refreshContainers = _codemirror_state.StateEffect.define();
+/**
 * 自定义 facet 用于传递编辑回调
 */
 var containerEditCallback = _codemirror_state.Facet.define({ combine: (values) => values.length ? values[values.length - 1] : null });
@@ -1337,18 +1381,20 @@ var ContainerHeaderWidget = class extends _codemirror_view.WidgetType {
 	typeName;
 	containerIndex;
 	registered;
-	constructor(typeName, containerIndex, registered) {
+	quotePrefix;
+	constructor(typeName, containerIndex, registered, quotePrefix) {
 		super();
 		this.typeName = typeName;
 		this.containerIndex = containerIndex;
 		this.registered = registered;
+		this.quotePrefix = quotePrefix;
 	}
 	toDOM() {
 		const container = document.createElement("span");
 		container.className = "container-widget-header";
 		const text = document.createElement("span");
 		text.className = "container-widget-text";
-		text.textContent = `:::${this.typeName}`;
+		text.textContent = `${this.quotePrefix}:::${this.typeName}`;
 		container.appendChild(text);
 		if (this.registered) {
 			const button = document.createElement("button");
@@ -1362,7 +1408,7 @@ var ContainerHeaderWidget = class extends _codemirror_view.WidgetType {
 		return container;
 	}
 	eq(other) {
-		return this.typeName === other.typeName && this.containerIndex === other.containerIndex && this.registered === other.registered;
+		return this.typeName === other.typeName && this.containerIndex === other.containerIndex && this.registered === other.registered && this.quotePrefix === other.quotePrefix;
 	}
 	ignoreEvent() {
 		return false;
@@ -1370,38 +1416,46 @@ var ContainerHeaderWidget = class extends _codemirror_view.WidgetType {
 };
 /**
 * 只读的容器属性行 Widget（显示 { key: value, ... }）
+* 嵌套在引用中时原始行带 "> " 前缀，展示时剔除，与头行 widget 风格一致
 */
 var ContainerPropsWidget = class extends _codemirror_view.WidgetType {
 	propsText;
-	constructor(propsText) {
+	quotePrefix;
+	constructor(propsText, quotePrefix) {
 		super();
 		this.propsText = propsText;
+		this.quotePrefix = quotePrefix;
 	}
 	toDOM() {
 		const span = document.createElement("span");
 		span.className = "container-widget-props";
-		span.textContent = this.propsText;
+		span.textContent = this.propsText.startsWith(this.quotePrefix) ? this.propsText.slice(this.quotePrefix.length) : this.propsText;
 		return span;
 	}
 	eq(other) {
-		return this.propsText === other.propsText;
+		return this.propsText === other.propsText && this.quotePrefix === other.quotePrefix;
 	}
 	ignoreEvent() {
 		return false;
 	}
 };
 /**
-* 只读的容器结束行 Widget（显示 :::）
+* 只读的容器结束行 Widget（显示 :::，嵌套引用时保留 "> " 前缀）
 */
 var ContainerCloseWidget = class extends _codemirror_view.WidgetType {
+	text;
+	constructor(text) {
+		super();
+		this.text = text;
+	}
 	toDOM() {
 		const span = document.createElement("span");
 		span.className = "container-widget-text";
-		span.textContent = ":::";
+		span.textContent = this.text;
 		return span;
 	}
-	eq() {
-		return true;
+	eq(other) {
+		return this.text === other.text;
 	}
 	ignoreEvent() {
 		return false;
@@ -1419,14 +1473,14 @@ function findContainerDecorations(state) {
 		decorations.push({
 			from: headerLine.from,
 			to: headerLine.to,
-			value: _codemirror_view.Decoration.replace({ widget: new ContainerHeaderWidget(container.typeName, index, container.registered) })
+			value: _codemirror_view.Decoration.replace({ widget: new ContainerHeaderWidget(container.typeName, index, container.registered, container.quotePrefix ?? "") })
 		});
 		if (container.propsLineFrom > 0 && container.propsLineTo > 0) {
 			const propsLine = state.doc.lineAt(container.propsLineFrom);
 			decorations.push({
 				from: propsLine.from,
 				to: propsLine.to,
-				value: _codemirror_view.Decoration.replace({ widget: new ContainerPropsWidget(propsLine.text) })
+				value: _codemirror_view.Decoration.replace({ widget: new ContainerPropsWidget(propsLine.text, container.quotePrefix ?? "") })
 			});
 		}
 		if (container.endPos > 0) {
@@ -1434,10 +1488,11 @@ function findContainerDecorations(state) {
 			decorations.push({
 				from: endLine.from,
 				to: endLine.to,
-				value: _codemirror_view.Decoration.replace({ widget: new ContainerCloseWidget() })
+				value: _codemirror_view.Decoration.replace({ widget: new ContainerCloseWidget(endLine.text) })
 			});
 		}
 	});
+	decorations.sort((a, b) => a.from - b.from || b.to - a.to);
 	return decorations;
 }
 /**
@@ -1466,11 +1521,19 @@ function handleEditButtonClick(event, view) {
 */
 var containerWidgetPlugin = _codemirror_view.ViewPlugin.fromClass(class {
 	decorations;
+	/** 上次构建装饰时的注册中心版本，用于感知异步注册（不能标 private，否则导出匿名类的 dts 报 TS4094） */
+	registryVersion;
 	constructor(view) {
+		this.registryVersion = componentRegistry.getVersion();
 		this.decorations = _codemirror_view.Decoration.set(findContainerDecorations(view.state), true);
 	}
 	update(update) {
-		if (update.docChanged) this.decorations = _codemirror_view.Decoration.set(findContainerDecorations(update.state), true);
+		const registryChanged = componentRegistry.getVersion() !== this.registryVersion;
+		const woken = update.transactions.some((tr) => tr.effects.some((e) => e.is(refreshContainers)));
+		if (update.docChanged || registryChanged || woken) {
+			this.registryVersion = componentRegistry.getVersion();
+			this.decorations = _codemirror_view.Decoration.set(findContainerDecorations(update.state), true);
+		}
 	}
 }, {
 	decorations: (value) => value.decorations,
@@ -2861,13 +2924,17 @@ function renderFormItemComponent(field) {
 }
 /**
 * 根据 fields 自动生成 Form.Item 列表
+* 初始值走 <Form initialValues> + 按次打开的 key：
+* initialValues 在字段实体注册时消费，天然避开“Modal 首次挂载前 setFieldsValue 落空”的时序竞态；
+* key 每次打开变化触发 Form 重挂载，确保切换到不同容器时重新取值。
 */
-function renderAutoForm(form, fields) {
+function renderAutoForm(form, fields, initialValues, initKey) {
 	if (!fields || fields.length === 0) return null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form, {
 		form,
 		layout: "vertical",
 		preserve: false,
+		initialValues,
 		children: fields.map((field) => {
 			if (!field.componentType) return null;
 			const formItemProps = {
@@ -2881,7 +2948,7 @@ function renderAutoForm(form, fields) {
 				children: renderFormItemComponent(field)
 			}, field.key);
 		})
-	});
+	}, initKey);
 }
 /** 字符串形式的历史属性值（'true'/'false'）还原为布尔，供 Switch 初始化 */
 function toFormInitialValue(field, value) {
@@ -2920,7 +2987,7 @@ function normalizeValue(field, value) {
 * 属性编辑弹窗组件
 * 根据组件 schema 的 renderDialog 函数渲染弹窗内容
 */
-function EditDialog({ visible, typeName, currentProps, onSave, onClose }) {
+function EditDialog({ visible, typeName, currentProps, initKey, onSave, onClose }) {
 	const schema = componentRegistry.get(typeName);
 	const [formProps, setFormProps] = (0, react.useState)({});
 	const [form] = antd.Form.useForm();
@@ -2936,16 +3003,19 @@ function EditDialog({ visible, typeName, currentProps, onSave, onClose }) {
 			...currentProps
 		};
 	}, [schema, currentProps]);
+	const initialValues = (0, react.useMemo)(() => {
+		const initial = {};
+		for (const [key, value] of Object.entries(mergedProps)) {
+			const field = schema?.fields?.find((f) => f.key === key);
+			const formValue = toFormInitialValue(field ?? { key }, value);
+			if (formValue !== void 0) initial[key] = formValue;
+		}
+		return initial;
+	}, [mergedProps, schema]);
 	(0, react.useEffect)(() => {
 		if (visible) {
 			setFormProps({});
-			const initial = {};
-			for (const [key, value] of Object.entries(mergedProps)) {
-				const field = schema?.fields?.find((f) => f.key === key);
-				const formValue = toFormInitialValue(field ?? { key }, value);
-				if (formValue !== void 0) initial[key] = formValue;
-			}
-			form.setFieldsValue(initial);
+			form.setFieldsValue(initialValues);
 			dirtyRef.current = false;
 		}
 	}, [visible, form]);
@@ -3000,7 +3070,7 @@ function EditDialog({ visible, typeName, currentProps, onSave, onClose }) {
 	};
 	const renderDialogContent = () => {
 		if (schema.renderDialog) return schema.renderDialog(context);
-		if (schema.fields?.some((f) => f.componentType) && schema.fields) return renderAutoForm(form, schema.fields);
+		if (schema.fields?.some((f) => f.componentType) && schema.fields) return renderAutoForm(form, schema.fields, initialValues, initKey);
 		return null;
 	};
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Modal, {
@@ -3027,19 +3097,20 @@ function writeContainerProps(props) {
 * 更新编辑器文档中的容器属性。
 * 已有属性行则整行替换；没有属性行则在容器头行后插入一行。
 * @param headerPos 容器头行（:::type）任意位置，用于无属性行时定位插入点
+* @param quotePrefix 容器所处的引用前缀（如 "> "），嵌套在引用中时插入的属性行需保持一致
 */
-function updateContainerProps(view, headerPos, propsLineFrom, propsLineTo, newProps) {
+function updateContainerProps(view, headerPos, propsLineFrom, propsLineTo, newProps, quotePrefix = "") {
 	const newPropsLine = writeContainerProps(newProps);
 	if (propsLineTo > propsLineFrom) view.dispatch({ changes: {
 		from: propsLineFrom,
 		to: propsLineTo,
-		insert: newPropsLine
+		insert: `${quotePrefix}${newPropsLine}`
 	} });
 	else {
 		const headerLine = view.state.doc.lineAt(headerPos);
 		view.dispatch({ changes: {
 			from: headerLine.to,
-			insert: `\n${newPropsLine}`
+			insert: `\n${quotePrefix}${newPropsLine}`
 		} });
 	}
 }
@@ -3164,6 +3235,7 @@ var MarkdownEditorInner = ({ defaultValue = "", value, onChange, showPreview = t
 	const [dialogVisible, setDialogVisible] = (0, react.useState)(false);
 	const [dialogTypeName, setDialogTypeName] = (0, react.useState)("");
 	const [dialogContainer, setDialogContainer] = (0, react.useState)(null);
+	const [dialogSeq, setDialogSeq] = (0, react.useState)(0);
 	const app = antd.App.useApp();
 	const notify = (0, react.useCallback)((type, text) => {
 		if (onNotify) {
@@ -3183,6 +3255,9 @@ var MarkdownEditorInner = ({ defaultValue = "", value, onChange, showPreview = t
 	}, [onChange]);
 	(0, react.useImperativeHandle)(ref, () => ({ getContent: () => content }), [content]);
 	const registryVersion = useRegistryVersion();
+	(0, react.useEffect)(() => {
+		editorView?.dispatch({ effects: refreshContainers.of(null) });
+	}, [registryVersion, editorView]);
 	const extraToolbarItems = (0, react.useMemo)(() => {
 		const merged = /* @__PURE__ */ new Map();
 		for (const schema of componentRegistry.getAll()) merged.set(schema.name, schema);
@@ -3216,10 +3291,11 @@ var MarkdownEditorInner = ({ defaultValue = "", value, onChange, showPreview = t
 	const handleEditContainer = (0, react.useCallback)((_view, container) => {
 		setDialogTypeName(container.typeName);
 		setDialogContainer(container);
+		setDialogSeq((seq) => seq + 1);
 		setDialogVisible(true);
 	}, []);
 	const handleDialogSave = (0, react.useCallback)((newProps) => {
-		if (editorView && dialogContainer) updateContainerProps(editorView, dialogContainer.startPos, dialogContainer.propsLineFrom, dialogContainer.propsLineTo, newProps);
+		if (editorView && dialogContainer) updateContainerProps(editorView, dialogContainer.startPos, dialogContainer.propsLineFrom, dialogContainer.propsLineTo, newProps, dialogContainer.quotePrefix);
 	}, [editorView, dialogContainer]);
 	const handleDialogClose = (0, react.useCallback)(() => {
 		setDialogVisible(false);
@@ -3256,6 +3332,7 @@ var MarkdownEditorInner = ({ defaultValue = "", value, onChange, showPreview = t
 				visible: dialogVisible,
 				typeName: dialogTypeName,
 				currentProps: dialogContainer?.props ?? {},
+				initKey: dialogSeq,
 				onSave: handleDialogSave,
 				onClose: handleDialogClose
 			})