ds-markdown 0.0.6 → 0.0.8-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -15
- package/dist/cjs/AutoScroll/index.d.ts +6 -0
- package/dist/cjs/AutoScroll/index.js +9 -0
- package/dist/cjs/AutoScroll/index.js.map +1 -0
- package/dist/cjs/Markdown/index.js +0 -2
- package/dist/cjs/Markdown/index.js.map +1 -1
- package/dist/cjs/MarkdownCMD/index.js +109 -16
- package/dist/cjs/MarkdownCMD/index.js.map +1 -1
- package/dist/cjs/components/HighReactMarkdown/Highlighter/index.d.ts +3 -0
- package/dist/cjs/components/HighReactMarkdown/Highlighter/index.js +15 -1
- package/dist/cjs/components/HighReactMarkdown/Highlighter/index.js.map +1 -1
- package/dist/cjs/components/HighReactMarkdown/index.js +2 -1
- package/dist/cjs/components/HighReactMarkdown/index.js.map +1 -1
- package/dist/cjs/defined.d.ts +22 -3
- package/dist/esm/AutoScroll/index.d.ts +6 -0
- package/dist/esm/AutoScroll/index.js +7 -0
- package/dist/esm/AutoScroll/index.js.map +1 -0
- package/dist/esm/Markdown/index.js +0 -2
- package/dist/esm/Markdown/index.js.map +1 -1
- package/dist/esm/MarkdownCMD/index.js +110 -17
- package/dist/esm/MarkdownCMD/index.js.map +1 -1
- package/dist/esm/components/HighReactMarkdown/Highlighter/index.d.ts +3 -0
- package/dist/esm/components/HighReactMarkdown/Highlighter/index.js +12 -1
- package/dist/esm/components/HighReactMarkdown/Highlighter/index.js.map +1 -1
- package/dist/esm/components/HighReactMarkdown/index.js +2 -1
- package/dist/esm/components/HighReactMarkdown/index.js.map +1 -1
- package/dist/esm/defined.d.ts +22 -3
- package/dist/style.css +549 -0
- package/package.json +5 -4
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
|
|
2
|
+
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
|
|
3
3
|
import HighReactMarkdown from '../components/HighReactMarkdown/index.js';
|
|
4
4
|
import classNames from 'classnames';
|
|
5
|
-
const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onEnd, onStart }, ref) => {
|
|
5
|
+
const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onEnd, onStart, onTypedChar }, ref) => {
|
|
6
6
|
/** 当前需要打字的内容 */
|
|
7
7
|
const charsRef = useRef([]);
|
|
8
|
+
/** 已经打过的字 */
|
|
9
|
+
const typedCharsRef = useRef(undefined);
|
|
8
10
|
/** 是否卸载 */
|
|
9
11
|
const isUnmountRef = useRef(false);
|
|
10
12
|
/** 是否正在打字 */
|
|
@@ -15,6 +17,9 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
15
17
|
/** 打字开始回调 */
|
|
16
18
|
const onStartRef = useRef(onStart);
|
|
17
19
|
onStartRef.current = onStart;
|
|
20
|
+
/** 打字过程中回调 */
|
|
21
|
+
const onTypedCharRef = useRef(onTypedChar);
|
|
22
|
+
onTypedCharRef.current = onTypedChar;
|
|
18
23
|
const timerRef = useRef(null);
|
|
19
24
|
const [stableParagraphs, setStableParagraphs] = useState([]);
|
|
20
25
|
const [currentParagraph, setCurrentParagraph] = useState(undefined);
|
|
@@ -33,31 +38,120 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
33
38
|
isUnmountRef.current = true;
|
|
34
39
|
};
|
|
35
40
|
}, []);
|
|
36
|
-
|
|
41
|
+
const thinkingParagraphs = useMemo(() => stableParagraphs.filter((paragraph) => paragraph.answerType === 'thinking'), [stableParagraphs]);
|
|
42
|
+
const answerParagraphs = useMemo(() => stableParagraphs.filter((paragraph) => paragraph.answerType === 'answer'), [stableParagraphs]);
|
|
43
|
+
const recordTypedChars = (char) => {
|
|
44
|
+
let prevStr = '';
|
|
45
|
+
if (!typedCharsRef.current || typedCharsRef.current.answerType !== char.answerType) {
|
|
46
|
+
typedCharsRef.current = {
|
|
47
|
+
typedContent: char.content,
|
|
48
|
+
answerType: char.answerType,
|
|
49
|
+
prevStr: '',
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
prevStr = typedCharsRef.current.typedContent;
|
|
54
|
+
typedCharsRef.current.typedContent += char.content;
|
|
55
|
+
typedCharsRef.current.prevStr = prevStr;
|
|
56
|
+
}
|
|
57
|
+
return {
|
|
58
|
+
prevStr,
|
|
59
|
+
nextStr: typedCharsRef.current?.typedContent || '',
|
|
60
|
+
};
|
|
61
|
+
};
|
|
62
|
+
/**
|
|
63
|
+
* 触发打字开始回调
|
|
64
|
+
* @param char 当前字符
|
|
65
|
+
*/
|
|
66
|
+
const triggerOnStart = (char) => {
|
|
67
|
+
const onStartFn = onStartRef.current;
|
|
68
|
+
if (!onStartFn) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
const { prevStr } = recordTypedChars(char);
|
|
72
|
+
onStartRef.current?.({
|
|
73
|
+
currentIndex: prevStr.length,
|
|
74
|
+
currentChar: char.content,
|
|
75
|
+
answerType: char.answerType,
|
|
76
|
+
prevStr,
|
|
77
|
+
});
|
|
78
|
+
};
|
|
79
|
+
/**
|
|
80
|
+
* 触发打字结束回调
|
|
81
|
+
*/
|
|
82
|
+
const triggerOnEnd = () => {
|
|
83
|
+
const onEndFn = onEndRef.current;
|
|
84
|
+
if (!onEndFn) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
onEndFn({
|
|
88
|
+
str: typedCharsRef.current?.typedContent,
|
|
89
|
+
answerType: typedCharsRef.current?.answerType,
|
|
90
|
+
});
|
|
91
|
+
};
|
|
92
|
+
/**
|
|
93
|
+
* 触发打字过程中回调
|
|
94
|
+
* @param char 当前字符
|
|
95
|
+
* @param isStartPoint 是否是开始打字(第一个字)
|
|
96
|
+
*/
|
|
97
|
+
const triggerOnTypedChar = (char, isStartPoint = false) => {
|
|
98
|
+
const onTypedCharFn = onTypedCharRef.current;
|
|
99
|
+
if (!isStartPoint) {
|
|
100
|
+
recordTypedChars(char);
|
|
101
|
+
}
|
|
102
|
+
if (!onTypedCharFn) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
onTypedCharFn({
|
|
106
|
+
currentIndex: typedCharsRef.current?.prevStr.length || 0,
|
|
107
|
+
currentChar: char.content,
|
|
108
|
+
answerType: char.answerType,
|
|
109
|
+
prevStr: typedCharsRef.current?.prevStr || '',
|
|
110
|
+
});
|
|
111
|
+
};
|
|
112
|
+
const startTypedTask = () => {
|
|
37
113
|
if (isTypedRef.current) {
|
|
38
114
|
return;
|
|
39
115
|
}
|
|
40
116
|
const chars = charsRef.current;
|
|
117
|
+
const stopTyped = () => {
|
|
118
|
+
isTypedRef.current = false;
|
|
119
|
+
if (timerRef.current) {
|
|
120
|
+
clearTimeout(timerRef.current);
|
|
121
|
+
timerRef.current = null;
|
|
122
|
+
}
|
|
123
|
+
triggerOnEnd();
|
|
124
|
+
};
|
|
41
125
|
function nextTyped() {
|
|
126
|
+
if (chars.length === 0) {
|
|
127
|
+
stopTyped();
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
42
130
|
timerRef.current = setTimeout(startTyped, interval);
|
|
43
131
|
}
|
|
44
|
-
|
|
132
|
+
/**
|
|
133
|
+
* 开始打字
|
|
134
|
+
* @param isStartPoint 是否是开始打字
|
|
135
|
+
*/
|
|
136
|
+
function startTyped(isStartPoint = false) {
|
|
45
137
|
if (isUnmountRef.current) {
|
|
46
138
|
return;
|
|
47
139
|
}
|
|
48
140
|
isTypedRef.current = true;
|
|
49
|
-
onStartRef.current?.();
|
|
50
141
|
const char = chars.shift();
|
|
51
142
|
if (char === undefined) {
|
|
52
|
-
|
|
53
|
-
if (timerRef.current) {
|
|
54
|
-
clearTimeout(timerRef.current);
|
|
55
|
-
timerRef.current = null;
|
|
56
|
-
}
|
|
57
|
-
onEndRef.current?.();
|
|
143
|
+
stopTyped();
|
|
58
144
|
return;
|
|
59
145
|
}
|
|
146
|
+
if (isStartPoint) {
|
|
147
|
+
triggerOnStart(char);
|
|
148
|
+
triggerOnTypedChar(char, isStartPoint);
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
triggerOnTypedChar(char);
|
|
152
|
+
}
|
|
60
153
|
const currentParagraph = currentParagraphRef.current;
|
|
154
|
+
/** 如果碰到 则需要处理成两个段落 */
|
|
61
155
|
if (char.content === '\n\n') {
|
|
62
156
|
if (currentParagraph) {
|
|
63
157
|
setStableParagraphs((prev) => {
|
|
@@ -90,6 +184,7 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
90
184
|
nextTyped();
|
|
91
185
|
return;
|
|
92
186
|
}
|
|
187
|
+
// 处理当前段落
|
|
93
188
|
let _currentParagraph = currentParagraph;
|
|
94
189
|
const newCurrentParagraph = {
|
|
95
190
|
content: '',
|
|
@@ -102,6 +197,7 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
102
197
|
_currentParagraph = newCurrentParagraph;
|
|
103
198
|
}
|
|
104
199
|
else if (currentParagraph && currentParagraph?.answerType !== char.answerType) {
|
|
200
|
+
// 如果当前段落和当前字符的回答类型不一致，则需要处理成两个段落
|
|
105
201
|
setStableParagraphs((prev) => {
|
|
106
202
|
const newParagraphs = [...prev];
|
|
107
203
|
newParagraphs.push({ ...currentParagraph, isTyped: false });
|
|
@@ -119,11 +215,11 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
119
215
|
});
|
|
120
216
|
nextTyped();
|
|
121
217
|
}
|
|
122
|
-
startTyped();
|
|
123
|
-
}
|
|
218
|
+
startTyped(true);
|
|
219
|
+
};
|
|
124
220
|
useImperativeHandle(ref, () => ({
|
|
125
221
|
push: (content, answerType) => {
|
|
126
|
-
//
|
|
222
|
+
// 如果两个\n,则\n这两个字符要合一起，作为一个字符处理,并且把多个\n处理成一个\n
|
|
127
223
|
const charsGroup = content.split('\n\n');
|
|
128
224
|
charsGroup.forEach((chars, index) => {
|
|
129
225
|
if (isClosePrettyTyped) {
|
|
@@ -136,7 +232,6 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
136
232
|
charsRef.current.push({ content: '\n\n', answerType });
|
|
137
233
|
}
|
|
138
234
|
});
|
|
139
|
-
// charsRef.current.push({ content: content, answerType });
|
|
140
235
|
if (!isTypedRef.current) {
|
|
141
236
|
startTypedTask();
|
|
142
237
|
}
|
|
@@ -148,8 +243,6 @@ const MarkdownCMD = forwardRef(({ interval = 30, isClosePrettyTyped = false, onE
|
|
|
148
243
|
setCurrentParagraph(undefined);
|
|
149
244
|
},
|
|
150
245
|
}));
|
|
151
|
-
const thinkingParagraphs = stableParagraphs.filter((paragraph) => paragraph.answerType === 'thinking');
|
|
152
|
-
const answerParagraphs = stableParagraphs.filter((paragraph) => paragraph.answerType === 'answer');
|
|
153
246
|
const getParagraphs = (paragraphs, answerType) => {
|
|
154
247
|
return (_jsxs("div", { className: `ds-markdown-paragraph ds-typed-${answerType}`, children: [paragraphs.map((paragraph, index) => {
|
|
155
248
|
if (paragraph.type === 'br') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/MarkdownCMD/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/MarkdownCMD/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import Prism from 'prismjs';
|
|
3
|
+
import classNames from 'classnames';
|
|
4
|
+
// 必须手动导入 TSX 相关语言定义
|
|
5
|
+
import 'prismjs/components/prism-typescript';
|
|
6
|
+
import 'prismjs/components/prism-jsx';
|
|
7
|
+
import 'prismjs/components/prism-tsx'; // TSX 核心语法
|
|
8
|
+
console.log(Prism.languages);
|
|
2
9
|
const modulePrefix = 'Highlighter';
|
|
3
10
|
const Highlighter = ({ children }) => {
|
|
4
|
-
|
|
11
|
+
const html = Prism.highlight(children, Prism.languages.jsx, 'jsx');
|
|
12
|
+
return (_jsx("pre", { className: classNames({
|
|
13
|
+
[modulePrefix]: true,
|
|
14
|
+
'language-jsx': true,
|
|
15
|
+
}), children: _jsx("code", { className: "language-jsx", dangerouslySetInnerHTML: { __html: html } }) }));
|
|
5
16
|
};
|
|
6
17
|
export default Highlighter;
|
|
7
18
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/HighReactMarkdown/Highlighter/index.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/HighReactMarkdown/Highlighter/index.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,oBAAoB;AACpB,OAAO,qCAAqC,CAAC;AAC7C,OAAO,8BAA8B,CAAC;AACtC,OAAO,8BAA8B,CAAC,CAAC,WAAW;AAElD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;AAM7B,MAAM,YAAY,GAAG,aAAa,CAAC;AACnC,MAAM,WAAW,GAA+B,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC/D,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnE,OAAO,CACL,cACE,SAAS,EAAE,UAAU,CAAC;YACpB,CAAC,YAAY,CAAC,EAAE,IAAI;YACpB,cAAc,EAAE,IAAI;SACrB,CAAC,YAEF,eAAM,SAAS,EAAC,cAAc,EAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAI,GACxE,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import { memo } from 'react';
|
|
3
3
|
import Markdown from 'react-markdown';
|
|
4
4
|
import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
|
|
5
|
+
import style from 'react-syntax-highlighter/dist/esm/styles/prism/coy';
|
|
5
6
|
import gfmPlugin from 'remark-gfm';
|
|
6
7
|
import BlockWrap from '../BlockWrap/index.js';
|
|
7
8
|
const modulePrefix = 'HighReactMarkdown';
|
|
@@ -9,7 +10,7 @@ const HighReactMarkdown = (props) => {
|
|
|
9
10
|
return (_jsx(Markdown, { remarkPlugins: [gfmPlugin], components: {
|
|
10
11
|
code: ({ className, children, ...props }) => {
|
|
11
12
|
const match = /language-(\w+)/.exec(className || '');
|
|
12
|
-
return match ? (_jsx(BlockWrap, { language: match[1], children: _jsx(SyntaxHighlighter, { language: match[1], children: String(children).replace(/\n$/, '') }) })) : (_jsx("code", { className: className, ...props, children: children }));
|
|
13
|
+
return match ? (_jsx(BlockWrap, { language: match[1], children: _jsx(SyntaxHighlighter, { useInlineStyles: false, language: match[1], style: style, children: String(children).replace(/\n$/, '') }) })) : (_jsx("code", { className: className, ...props, children: children }));
|
|
13
14
|
},
|
|
14
15
|
table: ({ children, ...props }) => {
|
|
15
16
|
return (_jsx("div", { className: "markdown-table-wrapper", children: _jsx("table", { className: "ds-markdown-table", children: children }) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/HighReactMarkdown/index.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,KAAK,IAAI,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/HighReactMarkdown/index.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,KAAK,IAAI,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,MAAM,oDAAoD,CAAC;AACvE,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAM9C,MAAM,YAAY,GAAG,mBAAmB,CAAC;AACzC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IACpE,OAAO,CACL,KAAC,QAAQ,IACP,aAAa,EAAE,CAAC,SAAS,CAAC,EAC1B,UAAU,EAAE;YACV,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;gBAC1C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;gBACrD,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,KAAC,SAAS,IAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,YAC3B,KAAC,iBAAiB,IAAC,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,YACxE,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAClB,GAEV,CACb,CAAC,CAAC,CAAC,CACF,eAAM,SAAS,EAAE,SAAS,KAAM,KAAK,YAClC,QAAQ,GACJ,CACR,CAAC;YACJ,CAAC;YACD,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;gBAChC,OAAO,CACL,cAAK,SAAS,EAAC,wBAAwB,YACrC,gBAAO,SAAS,EAAC,mBAAmB,YAAE,QAAQ,GAAS,GACnD,CACP,CAAC;YACJ,CAAC;SACF,KACG,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,IAAI,CAAC,iBAAiB,CAAC,CAAC"}
|
package/dist/esm/defined.d.ts
CHANGED
|
@@ -22,8 +22,27 @@ export interface MarkdownProps {
|
|
|
22
22
|
interval: number;
|
|
23
23
|
/** 是否关闭匀速打字机效果 */
|
|
24
24
|
isClosePrettyTyped?: boolean;
|
|
25
|
-
/**
|
|
26
|
-
onEnd?: (
|
|
25
|
+
/** 打字完成后回调, */
|
|
26
|
+
onEnd?: (data?: {
|
|
27
|
+
str?: string;
|
|
28
|
+
answerType?: AnswerType;
|
|
29
|
+
}) => void;
|
|
27
30
|
/** 开始打字回调 */
|
|
28
|
-
onStart?: (
|
|
31
|
+
onStart?: (data?: {
|
|
32
|
+
currentIndex: number;
|
|
33
|
+
currentChar: string;
|
|
34
|
+
answerType: AnswerType;
|
|
35
|
+
prevStr: string;
|
|
36
|
+
}) => void;
|
|
37
|
+
/**
|
|
38
|
+
* 打字机打完一个字符回调
|
|
39
|
+
* @param char 字符
|
|
40
|
+
* @param index 字符索引
|
|
41
|
+
*/
|
|
42
|
+
onTypedChar?: (data?: {
|
|
43
|
+
currentIndex: number;
|
|
44
|
+
currentChar: string;
|
|
45
|
+
answerType: AnswerType;
|
|
46
|
+
prevStr: string;
|
|
47
|
+
}) => void;
|
|
29
48
|
}
|