Skip to content

Commit 1c6f60b

Browse files
committed
fix:修改meta
1 parent 5533db3 commit 1c6f60b

File tree

5 files changed

+50
-30
lines changed

5 files changed

+50
-30
lines changed

core/src/utils/index.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ const getProcessor = (scope: string) => {
1616
const getMeta = (meta: string | null): Record<string, string | boolean> => {
1717
let metaData: Record<string, string | boolean> = {};
1818
if (meta) {
19-
meta.split(/\|/).forEach((item) => {
20-
const value = item.trim();
21-
if (value) {
22-
const [field, val] = value.split(':');
23-
metaData[field] = val || true;
24-
}
25-
});
19+
const [field, val] = meta.split(':');
20+
metaData[field] = val || true;
21+
// meta.split(/\|/).forEach((item) => {
22+
// const value = item.trim();
23+
// if (value) {
24+
// const [field, val] = value.split(':');
25+
// metaData[field] = val || true;
26+
// }
27+
// });
2628
}
2729
return metaData;
2830
};

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"license": "MIT",
1515
"dependencies": {
1616
"@uiw/react-github-corners": "~1.5.3",
17-
"@uiw/react-markdown-preview": "~4.0.6",
17+
"@uiw/react-markdown-preview": "~4.0.7",
1818
"react": "18.1.0",
1919
"react-dom": "18.1.0",
2020
"uiw": "^4.21.7",

website/src/App-zh.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import Alert from "@uiw/react-alert";
1616

1717
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true-->
1818

19-
```jsx | preview
19+
```jsx preview
2020
import React from "react";
2121
import ReactDOM from "react-dom";
2222
import { Alert, ButtonGroup, Button } from "uiw";
@@ -78,7 +78,7 @@ export default Demo;
7878

7979
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true-->
8080

81-
```jsx | preview
81+
```jsx preview
8282
import React from "react";
8383
import ReactDOM from "react-dom";
8484
import { Alert, Button } from "uiw";
@@ -144,7 +144,7 @@ export default Demo;
144144

145145
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true-->
146146

147-
```jsx | preview
147+
```jsx preview
148148
import React from "react";
149149
import ReactDOM from "react-dom";
150150
import { Alert, ButtonGroup, Button } from "uiw";
@@ -258,7 +258,7 @@ import Alert from "@uiw/react-alert";
258258

259259
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true-->
260260

261-
```jsx | preview
261+
```jsx preview
262262
import React from "react";
263263
import ReactDOM from "react-dom";
264264
import { Alert, ButtonGroup, Button } from "uiw";
@@ -371,9 +371,7 @@ export default Demo;
371371

372372
这个对话框有两个按钮,单击 **`确定按钮`****`取消按钮`** 后,此对话框将关闭,将不触发 ~~`onConfirm`~~~~`onCancel`~~ 事件。因为这俩按钮是自定义按钮。你可以正对自定义按钮外面的对象定义 `className="w-alert-footer"` 将显示默认样式。
373373

374-
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true&name=base23-->
375-
376-
```jsx | preview:base23
374+
```jsx preview:base23
377375
import React from "react";
378376
import ReactDOM from "react-dom";
379377
import { Alert, ButtonGroup, Button } from "uiw";
@@ -429,7 +427,7 @@ export default Demo;
429427

430428
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true-->
431429

432-
```jsx | preview
430+
```jsx preview
433431
import React from "react";
434432
import ReactDOM from "react-dom";
435433
import { Alert, ButtonGroup, Button } from "uiw";

website/src/App.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11

22
## Basic
33

4-
<!--rehype:bgWhite=true&codeSandbox=true&codePen=true&name=base12-->
54

6-
```jsx | preview:base12
5+
```jsx preview:base12
76
import React from "react";
87
import ReactDOM from "react-dom";
98
import { Alert, ButtonGroup, Button } from "uiw";

website/src/App.tsx

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ const language = {
1414
},
1515
};
1616

17+
const getMetaData = (meta: string) => {
18+
if (meta) {
19+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
20+
const [field, name] = meta.split(':').map((item) => item.trim());
21+
if (name) {
22+
return name;
23+
}
24+
}
25+
return '';
26+
};
27+
1728
export type MdDataType = {
1829
source: string;
1930
BaseCodeData: Record<string | number, React.FC>;
@@ -62,27 +73,37 @@ export default function App() {
6273
* codePen 显示 Codepen 按钮,要特别注意 包导入的问题,实例中的 import 主要用于 Codepen 使用。
6374
*/
6475
code: ({ inline, node, ...props }) => {
65-
const { name, noPreview, noScroll, bgWhite, noCode, codePen, codeSandboxOption, codeSandbox, ...rest } =
66-
props as any;
67-
68-
if (inline) {
69-
return <code {...props} />;
70-
}
71-
const config = {
76+
const {
77+
'data-meta': meta,
7278
noPreview,
7379
noScroll,
7480
bgWhite,
7581
noCode,
7682
codePen,
7783
codeSandboxOption,
78-
} as any;
79-
if (Object.keys(config).filter((name) => config[name] !== undefined).length === 0) {
84+
codeSandbox,
85+
...rest
86+
} = props as any;
87+
88+
if (inline) {
8089
return <code {...props} />;
8190
}
91+
// const config = {
92+
// noPreview,
93+
// noScroll,
94+
// bgWhite,
95+
// noCode,
96+
// codePen,
97+
// codeSandboxOption,
98+
// } as any;
99+
// if (Object.keys(config).filter((name) => config[name] !== undefined).length === 0) {
100+
// return <code {...props} />;
101+
// }
82102
const line = node.position?.start.line;
83-
const Child = mdData.BaseCodeData[name || line || ''];
84-
if (typeof line === 'number' && typeof Child === 'function') {
85-
const copyNodes = mdData.codeBlockValue[line] || '';
103+
const funName = getMetaData(meta || '') || line;
104+
const Child = mdData.BaseCodeData[funName || ''];
105+
if (funName && typeof Child === 'function') {
106+
const copyNodes = mdData.codeBlockValue[funName] || '';
86107
return (
87108
<PreView code={<code {...rest} />} copyNodes={copyNodes}>
88109
<Child />

0 commit comments

Comments
 (0)