ds-markdown 0.0.10-beta.2 → 0.0.10-beta.3

package/dist/cjs/hooks/useTypingTask.js

@@ -0,0 +1,226 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useTypingTask = void 0;
+const react_1 = require("react");
+const useTypingTask = (options) => {
+    const { timerType = 'setTimeout', interval, charsRef, onEnd, onStart, onTypedChar, processCharDisplay } = options;
+    /** 是否卸载 */
+    const isUnmountRef = (0, react_1.useRef)(false);
+    /** 是否正在打字 */
+    const isTypedRef = (0, react_1.useRef)(false);
+    /** 动画帧ID */
+    const animationFrameRef = (0, react_1.useRef)(null);
+    /** 传统定时器（兼容模式） */
+    const timerRef = (0, react_1.useRef)(null);
+    // 已经打过的字记录
+    const typedCharsRef = (0, react_1.useRef)(undefined);
+    (0, react_1.useEffect)(() => {
+        isUnmountRef.current = false;
+        return () => {
+            isUnmountRef.current = true;
+        };
+    }, []);
+    /**
+     * 记录打过的字
+     * @param char 当前字符
+     * @returns
+     */
+    const recordTypedChars = (char) => {
+        let prevStr = '';
+        if (!typedCharsRef.current || typedCharsRef.current.answerType !== char.answerType) {
+            typedCharsRef.current = {
+                typedContent: char.content,
+                answerType: char.answerType,
+                prevStr: '',
+            };
+        }
+        else {
+            prevStr = typedCharsRef.current.typedContent;
+            typedCharsRef.current.typedContent += char.content;
+            typedCharsRef.current.prevStr = prevStr;
+        }
+        return {
+            prevStr,
+            nextStr: typedCharsRef.current?.typedContent || '',
+        };
+    };
+    /**
+     * 触发打字开始回调
+     * @param char 当前字符
+     */
+    const triggerOnStart = (char) => {
+        if (!onStart) {
+            return;
+        }
+        const { prevStr } = recordTypedChars(char);
+        onStart({
+            currentIndex: prevStr.length,
+            currentChar: char.content,
+            answerType: char.answerType,
+            prevStr,
+        });
+    };
+    /**
+     * 触发打字结束回调
+     */
+    const triggerOnEnd = () => {
+        if (!onEnd) {
+            return;
+        }
+        onEnd({
+            str: typedCharsRef.current?.typedContent,
+            answerType: typedCharsRef.current?.answerType,
+        });
+    };
+    /**
+     * 触发打字过程中回调
+     * @param char 当前字符
+     * @param isStartPoint 是否是开始打字(第一个字)
+     */
+    const triggerOnTypedChar = (char, isStartPoint = false) => {
+        if (!isStartPoint) {
+            recordTypedChars(char);
+        }
+        if (!onTypedChar) {
+            return;
+        }
+        onTypedChar({
+            currentIndex: typedCharsRef.current?.prevStr.length || 0,
+            currentChar: char.content,
+            answerType: char.answerType,
+            prevStr: typedCharsRef.current?.prevStr || '',
+        });
+    };
+    /** 清除定时器 */
+    const clearTimer = () => {
+        // 清理 requestAnimationFrame
+        if (animationFrameRef.current) {
+            cancelAnimationFrame(animationFrameRef.current);
+            animationFrameRef.current = null;
+        }
+        // 清理 setTimeout (可能被 timestamp 模式使用)
+        if (timerRef.current) {
+            clearTimeout(timerRef.current);
+            timerRef.current = null;
+        }
+        isTypedRef.current = false;
+        typedCharsRef.current = undefined;
+    };
+    /** 开始打字任务 */
+    const startTypedTask = () => {
+        if (isTypedRef.current) {
+            return;
+        }
+        if (timerType === 'requestAnimationFrame') {
+            startAnimationFrameMode();
+        }
+        else {
+            startTimeoutMode();
+        }
+    };
+    /** requestAnimationFrame 模式 */
+    const startAnimationFrameMode = () => {
+        const chars = charsRef.current;
+        let lastFrameTime = 0;
+        const frameLoop = (currentTime) => {
+            if (isUnmountRef.current)
+                return;
+            if (chars.length === 0) {
+                stopAnimationFrame();
+                return;
+            }
+            // 计算这一帧应该打多少个字符
+            if (lastFrameTime === 0) {
+                lastFrameTime = currentTime;
+            }
+            const deltaTime = currentTime - lastFrameTime;
+            const charsToType = Math.max(1, Math.floor(deltaTime / interval));
+            const actualCharsToType = Math.min(charsToType, chars.length);
+            // 处理字符
+            for (let i = 0; i < actualCharsToType; i++) {
+                const char = chars.shift();
+                if (char === undefined)
+                    break;
+                if (!isTypedRef.current) {
+                    isTypedRef.current = true;
+                    triggerOnStart(char);
+                    triggerOnTypedChar(char, true);
+                }
+                else {
+                    triggerOnTypedChar(char);
+                }
+                processCharDisplay(char);
+            }
+            lastFrameTime = currentTime;
+            // 继续下一帧
+            if (chars.length > 0) {
+                animationFrameRef.current = requestAnimationFrame(frameLoop);
+            }
+            else {
+                isTypedRef.current = false;
+                triggerOnEnd();
+            }
+        };
+        animationFrameRef.current = requestAnimationFrame(frameLoop);
+    };
+    /** 停止动画帧模式 */
+    const stopAnimationFrame = () => {
+        isTypedRef.current = false;
+        if (animationFrameRef.current) {
+            cancelAnimationFrame(animationFrameRef.current);
+            animationFrameRef.current = null;
+        }
+        triggerOnEnd();
+    };
+    /** setTimeout 模式 */
+    const startTimeoutMode = () => {
+        const chars = charsRef.current;
+        const nextTyped = () => {
+            if (chars.length === 0) {
+                stopTimeout();
+                return;
+            }
+            timerRef.current = setTimeout(startTyped, interval);
+        };
+        const startTyped = (isStartPoint = false) => {
+            if (isUnmountRef.current)
+                return;
+            isTypedRef.current = true;
+            const char = chars.shift();
+            if (char === undefined) {
+                stopTimeout();
+                return;
+            }
+            if (isStartPoint) {
+                triggerOnStart(char);
+                triggerOnTypedChar(char, isStartPoint);
+            }
+            else {
+                triggerOnTypedChar(char);
+            }
+            processCharDisplay(char);
+            nextTyped();
+        };
+        startTyped(true);
+    };
+    /** 停止超时模式 */
+    const stopTimeout = () => {
+        isTypedRef.current = false;
+        if (timerRef.current) {
+            clearTimeout(timerRef.current);
+            timerRef.current = null;
+        }
+        triggerOnEnd();
+    };
+    return {
+        start: startTypedTask,
+        stop: clearTimer,
+        clear: () => {
+            clearTimer();
+            typedCharsRef.current = undefined;
+        },
+        isTyping: () => isTypedRef.current,
+    };
+};
+exports.useTypingTask = useTypingTask;
+//# sourceMappingURL=useTypingTask.js.map

package/dist/cjs/hooks/useTypingTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useTypingTask.js","sourceRoot":"","sources":["../../../src/hooks/useTypingTask.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/rule.js

@@ -58,7 +58,6 @@ const segment = edit(_segment)
     .replace(/list/, list)
     .replace(/hr/, hr)
     .getRegex();
-console.log(segment.source);
 const blockNormal = {
     newline,
     fences,

package/dist/cjs/utils/rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../src/utils/rule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../src/utils/rule.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,MAAM,KAAK,GAAG;IACZ,KAAK,EAAE,aAAa;IACpB,aAAa,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,IAAI,+BAA+B,CAAC;IAC3F,eAAe,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,qDAAqD,CAAC;IACrI,eAAe,EAAE,MAAM;IACvB,YAAY,EAAE,MAAM;IACpB,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,aAAa;IACzB,eAAe,EAAE,cAAc;IAC/B,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,oDAAoD,CAAC;IAC5H,iBAAiB,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC;IACtF,cAAc,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,oBAAoB,EAAE,GAAG,CAAC;IACxG,gBAAgB,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,iBAAiB,CAAC;CACnG,CAAC;AAEF;;;;;GAKG;AACH,SAAS,IAAI,CAAC,KAAsB,EAAE,GAAG,GAAG,EAAE;IAC5C,IAAI,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAC9D,MAAM,GAAG,GAAG;QACV,OAAO,EAAE,CAAC,IAAqB,EAAE,GAAoB,EAAE,EAAE;YACvD,IAAI,SAAS,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;YAC3D,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC;QACb,CAAC;QACD,QAAQ,EAAE,GAAG,EAAE;YACb,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;KACF,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,OAAO,GAAG,sBAAsB,CAAC;AACvC,MAAM,EAAE,GAAG,oEAAoE,CAAC;AAChF,SAAS;AACT,MAAM,MAAM,GAAG,uBAAuB,CAAC;AACvC,SAAS;AACT,MAAM,IAAI,GAAG,IAAI,CAAC,sCAAsC,CAAC;KACtD,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;KACxB,QAAQ,EAAE,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,GAAG,6GAA6G,CAAC;AAC7H,MAAM;AACN,oEAAoE;AACpE,MAAM,QAAQ,GAAG,qDAAqD,CAAC;AAEvE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;KAC3B,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC;KACzB,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;KACrB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;KACjB,QAAQ,EAAE,CAAC;AAEd,MAAM,WAAW,GAAG;IAClB,OAAO;IACP,MAAM;IACN,OAAO;IACP,IAAI;IACJ,EAAE;CACH,CAAC;AAEW,QAAA,KAAK,GAAG;IACnB,KAAK,EAAE,WAAW;IAClB,KAAK;CACN,CAAC"}

package/dist/esm/MarkdownCMD/index.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { forwardRef, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import HighReactMarkdown from '../components/HighReactMarkdown/index.js';
 import classNames from 'classnames';
 import { compiler } from '../utils/compiler.js';
 import { __DEV__ } from '../constant.js';
 import deepClone from '../utils/methods/deepClone.js';
-const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onEnd, onStart, onTypedChar }, ref) => {
+import { useTypingTask } from '../hooks/useTypingTask.js';
+const MarkdownCMD = forwardRef(({ interval = 30, onEnd, onStart, onTypedChar, timerType = 'requestAnimationFrame' }, ref) => {
     /** 当前需要打字的内容 */
     const charsRef = useRef([]);
     /**
@@ -13,23 +14,6 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
      * 如果打字已经完全结束，则不会再触发打字效果
      */
     const isWholeTypedEndRef = useRef(false);
-    /** 已经打过的字 */
-    const typedCharsRef = useRef(undefined);
-    /** 是否卸载 */
-    const isUnmountRef = useRef(false);
-    /** 是否正在打字 */
-    const isTypedRef = useRef(false);
-    /** 打字结束回调, */
-    const onEndRef = useRef(onEnd);
-    onEndRef.current = onEnd;
-    /** 打字开始回调 */
-    const onStartRef = useRef(onStart);
-    onStartRef.current = onStart;
-    /** 打字过程中回调 */
-    const onTypedCharRef = useRef(onTypedChar);
-    onTypedCharRef.current = onTypedChar;
-    /** 打字定时器 */
-    const timerRef = useRef(null);
     /**
      * 稳定段落
      * 稳定段落是已经打过字，并且不会再变化的段落
@@ -39,174 +23,22 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
     const [currentSegment, setCurrentSegment] = useState(undefined);
     /** 当前段落引用 */
     const currentParagraphRef = useRef(undefined);
-    currentParagraphRef.current = currentSegment;
-    /** 清除打字定时器 */
-    const clearTimer = () => {
-        if (timerRef.current) {
-            clearTimeout(timerRef.current);
-            timerRef.current = null;
-        }
-        isTypedRef.current = false;
-    };
-    useEffect(() => {
-        isUnmountRef.current = false;
-        return () => {
-            isUnmountRef.current = true;
-        };
-    }, []);
-    /** 思考段落 */
-    const thinkingParagraphs = useMemo(() => stableSegments.filter((paragraph) => paragraph.answerType === 'thinking'), [stableSegments]);
-    /** 回答段落 */
-    const answerParagraphs = useMemo(() => stableSegments.filter((paragraph) => paragraph.answerType === 'answer'), [stableSegments]);
-    /**
-     * 记录打过的字
-     * @param char 当前字符
-     * @returns
-     */
-    const recordTypedChars = (char) => {
-        let prevStr = '';
-        if (!typedCharsRef.current || typedCharsRef.current.answerType !== char.answerType) {
-            typedCharsRef.current = {
-                typedContent: char.content,
-                answerType: char.answerType,
-                prevStr: '',
-            };
-        }
-        else {
-            prevStr = typedCharsRef.current.typedContent;
-            typedCharsRef.current.typedContent += char.content;
-            typedCharsRef.current.prevStr = prevStr;
-        }
-        return {
-            prevStr,
-            nextStr: typedCharsRef.current?.typedContent || '',
-        };
-    };
+    // currentParagraphRef.current = currentSegment;
     /**
-     * 触发打字开始回调
-     * @param char 当前字符
+     * 处理字符显示逻辑
      */
-    const triggerOnStart = (char) => {
-        const onStartFn = onStartRef.current;
-        if (!onStartFn) {
-            return;
-        }
-        const { prevStr } = recordTypedChars(char);
-        onStartRef.current?.({
-            currentIndex: prevStr.length,
-            currentChar: char.content,
-            answerType: char.answerType,
-            prevStr,
-        });
-    };
-    /**
-     * 触发打字结束回调
-     */
-    const triggerOnEnd = () => {
-        const onEndFn = onEndRef.current;
-        if (!onEndFn) {
-            return;
-        }
-        onEndFn({
-            str: typedCharsRef.current?.typedContent,
-            answerType: typedCharsRef.current?.answerType,
-        });
-    };
-    /**
-     * 触发打字过程中回调
-     * @param char 当前字符
-     * @param isStartPoint 是否是开始打字(第一个字)
-     */
-    const triggerOnTypedChar = (char, isStartPoint = false) => {
-        const onTypedCharFn = onTypedCharRef.current;
-        if (!isStartPoint) {
-            recordTypedChars(char);
-        }
-        if (!onTypedCharFn) {
-            return;
-        }
-        onTypedCharFn({
-            currentIndex: typedCharsRef.current?.prevStr.length || 0,
-            currentChar: char.content,
-            answerType: char.answerType,
-            prevStr: typedCharsRef.current?.prevStr || '',
-        });
-    };
-    /** 开始打字任务 */
-    const startTypedTask = () => {
-        if (isTypedRef.current) {
-            return;
-        }
-        const chars = charsRef.current;
-        /** 停止打字 */
-        const stopTyped = () => {
-            isTypedRef.current = false;
-            if (timerRef.current) {
-                clearTimeout(timerRef.current);
-                timerRef.current = null;
-            }
-            triggerOnEnd();
-        };
-        /** 打下一个字 */
-        const nextTyped = () => {
-            if (chars.length === 0) {
-                stopTyped();
-                return;
-            }
-            timerRef.current = setTimeout(startTyped, interval);
-        };
-        /**
-         * 开始打字
-         * @param isStartPoint 是否是开始打字
-         */
-        function startTyped(isStartPoint = false) {
-            if (isUnmountRef.current) {
-                return;
-            }
-            isTypedRef.current = true;
-            const char = chars.shift();
-            if (char === undefined) {
-                stopTyped();
-                return;
-            }
-            if (isStartPoint) {
-                triggerOnStart(char);
-                triggerOnTypedChar(char, isStartPoint);
-            }
-            else {
-                triggerOnTypedChar(char);
-            }
-            const currentSegment = currentParagraphRef.current;
-            /** 如果碰到 space，和split_segment 则需要处理成两个段落 */
-            if (char.contentType === 'space' || char.contentType === 'split_segment') {
-                if (currentSegment) {
-                    setStableSegments((prev) => {
-                        const newParagraphs = [...prev];
-                        // 放入到稳定队列
-                        if (currentSegment) {
-                            newParagraphs.push({ ...currentSegment, isTyped: false });
-                        }
-                        if (char.contentType === 'space') {
-                            newParagraphs.push({
-                                content: '',
-                                isTyped: false,
-                                type: 'br',
-                                answerType: char.answerType,
-                                tokensReference: {
-                                    [char.tokenId]: {
-                                        startIndex: 0,
-                                        raw: char.content,
-                                    },
-                                },
-                            });
-                        }
-                        return newParagraphs;
-                    });
-                    setCurrentSegment(undefined);
-                }
-                else {
-                    setStableSegments((prev) => {
-                        const newParagraphs = [...prev];
+    const processCharDisplay = (char) => {
+        const currentSegment = currentParagraphRef.current;
+        /** 如果碰到 space，和split_segment 则需要处理成两个段落 */
+        if (char.contentType === 'space' || char.contentType === 'split_segment') {
+            if (currentSegment) {
+                setStableSegments((prev) => {
+                    const newParagraphs = [...prev];
+                    // 放入到稳定队列
+                    if (currentSegment) {
+                        newParagraphs.push({ ...currentSegment, isTyped: false });
+                    }
+                    if (char.contentType === 'space') {
                         newParagraphs.push({
                             content: '',
                             isTyped: false,
@@ -219,58 +51,88 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
                                 },
                             },
                         });
-                        return newParagraphs;
-                    });
-                }
-                nextTyped();
-                return;
-            }
-            // 处理当前段落
-            let _currentParagraph = currentSegment;
-            const newCurrentParagraph = {
-                content: '',
-                isTyped: false,
-                type: 'text',
-                answerType: char.answerType,
-                tokensReference: {},
-            };
-            if (!_currentParagraph) {
-                // 如果当前没有段落，则直接设置为当前段落
-                _currentParagraph = newCurrentParagraph;
+                    }
+                    return newParagraphs;
+                });
+                setCurrentSegment(() => undefined);
+                currentParagraphRef.current = undefined;
             }
-            else if (currentSegment && currentSegment?.answerType !== char.answerType) {
-                // 如果当前段落和当前字符的回答类型不一致，则需要处理成两个段落
+            else {
                 setStableSegments((prev) => {
                     const newParagraphs = [...prev];
-                    newParagraphs.push({ ...currentSegment, isTyped: false });
+                    newParagraphs.push({
+                        content: '',
+                        isTyped: false,
+                        type: 'br',
+                        answerType: char.answerType,
+                        tokensReference: {
+                            [char.tokenId]: {
+                                startIndex: 0,
+                                raw: char.content,
+                            },
+                        },
+                    });
                     return newParagraphs;
                 });
-                _currentParagraph = newCurrentParagraph;
-                setCurrentSegment(_currentParagraph);
             }
-            setCurrentSegment((prev) => {
-                const tokensReference = deepClone(_currentParagraph.tokensReference);
-                if (tokensReference[char.tokenId]) {
-                    tokensReference[char.tokenId].raw += char.content;
-                    tokensReference[char.tokenId].startIndex = prev?.content?.length || 0;
-                }
-                else {
-                    tokensReference[char.tokenId] = {
-                        startIndex: prev?.content?.length || 0,
-                        raw: char.content,
-                    };
-                }
-                return {
-                    ..._currentParagraph,
-                    tokensReference,
-                    content: (prev?.content || '') + char.content,
-                    isTyped: true,
-                };
+            return;
+        }
+        // 处理当前段落
+        const newCurrentParagraph = {
+            content: '',
+            isTyped: false,
+            type: 'text',
+            answerType: char.answerType,
+            tokensReference: {},
+        };
+        let _currentParagraph = currentSegment;
+        if (!_currentParagraph) {
+            // 如果当前没有段落，则直接设置为新当前段落
+            _currentParagraph = newCurrentParagraph;
+        }
+        else if (currentSegment && currentSegment?.answerType !== char.answerType) {
+            // 如果当前段落和当前字符的回答类型不一致，则需要处理成两个段落
+            setStableSegments((prev) => {
+                const newParagraphs = [...prev];
+                newParagraphs.push({ ...currentSegment, isTyped: false });
+                return newParagraphs;
             });
-            nextTyped();
+            _currentParagraph = newCurrentParagraph;
+        }
+        const tokensReference = deepClone(_currentParagraph.tokensReference);
+        if (tokensReference[char.tokenId]) {
+            tokensReference[char.tokenId].raw += char.content;
+            tokensReference[char.tokenId].startIndex = currentSegment?.content?.length || 0;
         }
-        startTyped(true);
+        else {
+            tokensReference[char.tokenId] = {
+                startIndex: currentSegment?.content?.length || 0,
+                raw: char.content,
+            };
+        }
+        const newCurrentSegment = {
+            ..._currentParagraph,
+            tokensReference,
+            content: (currentSegment?.content || '') + char.content,
+            isTyped: true,
+        };
+        currentParagraphRef.current = newCurrentSegment;
+        setCurrentSegment(() => newCurrentSegment);
     };
+    /** 思考段落 */
+    const thinkingParagraphs = useMemo(() => stableSegments.filter((paragraph) => paragraph.answerType === 'thinking'), [stableSegments]);
+    /** 回答段落 */
+    const answerParagraphs = useMemo(() => stableSegments.filter((paragraph) => paragraph.answerType === 'answer'), [stableSegments]);
+    // 使用新的打字任务 hook
+    const typingTask = useTypingTask({
+        timerType,
+        interval,
+        charsRef,
+        onEnd,
+        onStart,
+        onTypedChar,
+        processCharDisplay,
+    });
     const lastSegmentRawRef = useRef({
         thinking: '',
         answer: '',
@@ -284,6 +146,9 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
          * @param answerType 回答类型 {AnswerType}
          */
         push: (content, answerType) => {
+            if (content.length === 0) {
+                return;
+            }
             const lastSegmentReference = lastSegmentRawRef.current[`${answerType}Reference`];
             if (isWholeTypedEndRef.current) {
                 if (__DEV__) {
@@ -301,7 +166,6 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
             else {
                 currentLastSegmentRaw = content;
             }
-            // debugger;
             const tokens = compiler(currentLastSegmentRaw);
             // 如果最后一个token是space，则把lastSegmentRaw设置为空
             if (tokens[tokens.length - 1].type === 'space') {
@@ -360,19 +224,21 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
                 }
             }
             lastSegmentRawRef.current[`${answerType}Reference`] = currentLastSegmentReference;
-            if (!isTypedRef.current) {
-                startTypedTask();
+            if (!typingTask.isTyping()) {
+                typingTask.start();
             }
         },
         /**
          * 清除打字任务
          */
         clear: () => {
-            clearTimer();
+            typingTask.stop();
             charsRef.current = [];
             setStableSegments([]);
             setCurrentSegment(undefined);
             isWholeTypedEndRef.current = false;
+            currentParagraphRef.current = undefined;
+            typingTask.clear();
             lastSegmentRawRef.current = {
                 thinking: '',
                 answer: '',
@@ -385,8 +251,12 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
          */
         triggerWholeEnd: () => {
             isWholeTypedEndRef.current = true;
-            if (!isTypedRef.current) {
-                triggerOnEnd();
+            if (!typingTask.isTyping()) {
+                // 这里需要手动触发结束回调，因为 hook 中的 triggerOnEnd 不能直接调用
+                onEnd?.({
+                    str: undefined,
+                    answerType: undefined,
+                });
             }
         },
     }));