Skip to content

Commit b172626

Browse files
committed
Merge branch 'next' of https://github.com/ant-design/x into next-alpha
2 parents 1f1cd0c + 05eeb85 commit b172626

File tree

16 files changed

+486
-55
lines changed

16 files changed

+486
-55
lines changed

CHANGELOG.en-US.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ tag: vVERSION
1616

1717
---
1818

19+
## 2.0.0-alpha.9
20+
21+
`2025-09-24`
22+
23+
### @ant-design/x-markdown
24+
25+
- 🐛 Fixed code highlighting plugin style loss, resolved component matching issues with nested child elements, and removed table text-align attribute from default styles. [#1212](https://github.com/ant-design/x/pull/1212) by [@Div627](https://github.com/Div627).
26+
1927
## 2.0.0-alpha.8
2028

2129
`2025-09-22`

CHANGELOG.zh-CN.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ tag: vVERSION
1515

1616
---
1717

18+
## 2.0.0-alpha.9
19+
20+
`2025-09-24`
21+
22+
### @ant-design/x-markdown
23+
24+
- 🐛 修复代码高亮插件样式丢失、组件无法匹配嵌套子元素的问题,并移除默认样式中的 table text-align 属性。[#1212](https://github.com/ant-design/x/pull/1212)[@Div627](https://github.com/Div627) 提交。
25+
1826
## 2.0.0-alpha.8
1927

2028
`2025-09-22`

README-zh_CN.md

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,49 @@
66

77
打造卓越 AI 界面解决方案,引领智能新体验。
88

9-
[![CI status][github-action-image]][github-action-url] [![codecov][codecov-image]][codecov-url] [![NPM version][npm-image]][npm-url]
9+
[![CI status][github-action-image]][github-action-url] [![codecov][codecov-image]][codecov-url] ![GitHub contributors][github-contributors]
1010

11-
[![NPM downloads][download-image]][download-url] [![][bundlephobia-image]][bundlephobia-url] [![antd][antd-image]][antd-url] [![Follow zhihu][zhihu-image]][zhihu-url]
11+
| Package | Latest Version | Download stats | Bundle Size | Package Size | JSDelivr |
12+
| :--- | :--- | :--- | :--- | :--- | :--- |
13+
| `@ant-design/x` | [![npm version][x-version-image]][x-version-url] | [![npm downloads][x-downloads-image]][x-downloads-url] | [![bundle size][x-bundle-size-image]][x-bundle-size-url] | [![package size][x-package-size-image]][x-package-size-url] | [![jsdelivr][x-jsdelivr-image]][x-jsdelivr-url] |
14+
| `@ant-design/x-markdown` | [![npm version][x-markdown-version-image]][x-markdown-version-url] | [![npm downloads][x-markdown-downloads-image]][x-markdown-downloads-url] | [![bundle size][x-markdown-bundle-size-image]][x-markdown-bundle-size-url] | [![package size][x-markdown-package-size-image]][x-markdown-package-size-url] | [![jsdelivr][x-markdown-jsdelivr-image]][x-markdown-jsdelivr-url] |
15+
| `@ant-design/x-sdk` | [![npm version][x-sdk-version-image]][x-sdk-version-url] | [![npm downloads][x-sdk-downloads-image]][x-sdk-downloads-url] | [![bundle size][x-sdk-bundle-size-image]][x-sdk-bundle-size-url] | [![package size][x-sdk-package-size-image]][x-sdk-package-size-url] | [![jsdelivr][x-sdk-jsdelivr-image]][x-sdk-jsdelivr-url] |
1216

1317
[更新日志](./CHANGELOG.zh-CN.md) · [报告一个 Bug][github-issues-bug-report] · [想新增特性?][github-issues-feature-request] · [English](./README.md) · 中文
1418

19+
[x-version-image]: https://img.shields.io/npm/v/@ant-design/x/alpha.svg?style=flat-square
20+
[x-version-url]: https://www.npmjs.com/package/@ant-design/x/v/alpha
21+
[x-downloads-image]: https://img.shields.io/npm/dm/@ant-design/x.svg?style=flat
22+
[x-downloads-url]: https://www.npmjs.com/package/@ant-design/x
23+
[x-bundle-size-image]: https://img.shields.io/bundlephobia/minzip/@ant-design/x
24+
[x-bundle-size-url]: https://bundlephobia.com/result?p=@ant-design/x
25+
[x-package-size-image]: https://packagephobia.com/badge?p=@ant-design/x
26+
[x-package-size-url]: https://packagephobia.com/result?p=@ant-design/x
27+
[x-jsdelivr-image]: https://data.jsdelivr.com/v1/package/npm/@ant-design/x/badge
28+
[x-jsdelivr-url]: https://www.jsdelivr.com/package/npm/@ant-design/x
29+
30+
[x-markdown-version-image]: https://img.shields.io/npm/v/@ant-design/x-markdown.svg?style=flat
31+
[x-markdown-version-url]: https://www.npmjs.com/package/@ant-design/x-markdown
32+
[x-markdown-downloads-image]: https://img.shields.io/npm/dm/@ant-design/x-markdown.svg?style=flat
33+
[x-markdown-downloads-url]: https://www.npmjs.com/package/@ant-design/x-markdown
34+
[x-markdown-bundle-size-image]: https://img.shields.io/bundlephobia/minzip/@ant-design/x-markdown
35+
[x-markdown-bundle-size-url]: https://bundlephobia.com/result?p=@ant-design/x-markdown
36+
[x-markdown-package-size-image]: https://packagephobia.com/badge?p=@ant-design/x-markdown
37+
[x-markdown-package-size-url]: https://packagephobia.com/result?p=@ant-design/x-markdown
38+
[x-markdown-jsdelivr-image]: https://data.jsdelivr.com/v1/package/npm/@ant-design/x-markdown/badge
39+
[x-markdown-jsdelivr-url]: https://www.jsdelivr.com/package/npm/@ant-design/x-markdown
40+
41+
[x-sdk-version-image]: https://img.shields.io/npm/v/@ant-design/x-sdk.svg?style=flat
42+
[x-sdk-version-url]: https://www.npmjs.com/package/@ant-design/x-sdk
43+
[x-sdk-downloads-image]: https://img.shields.io/npm/dm/@ant-design/x-sdk.svg?style=flat
44+
[x-sdk-downloads-url]: https://www.npmjs.com/package/@ant-design/x-sdk
45+
[x-sdk-bundle-size-image]: https://img.shields.io/bundlephobia/minzip/@ant-design/x-sdk
46+
[x-sdk-bundle-size-url]: https://bundlephobia.com/result?p=@ant-design/x-sdk
47+
[x-sdk-package-size-image]: https://packagephobia.com/badge?p=@ant-design/x-sdk
48+
[x-sdk-package-size-url]: https://packagephobia.com/result?p=@ant-design/x-sdk
49+
[x-sdk-jsdelivr-image]: https://data.jsdelivr.com/v1/package/npm/@ant-design/x-sdk/badge
50+
[x-sdk-jsdelivr-url]: https://www.jsdelivr.com/package/npm/@ant-design/x-sdk
51+
1552
[npm-image]: https://img.shields.io/npm/v/@ant-design/x.svg?style=flat-square
1653
[npm-url]: https://npmjs.org/package/@ant-design/x
1754
[github-action-image]: https://github.com/ant-design/x/actions/workflows/main.yml/badge.svg
@@ -28,6 +65,7 @@
2865
[antd-url]: https://ant.design
2966
[zhihu-image]: https://img.shields.io/badge/-Ant%20Design-white?logo=zhihu
3067
[zhihu-url]: https://www.zhihu.com/column/c_1564262000561106944
68+
[github-contributors]: https://img.shields.io/github/contributors-anon/ant-design/x
3169

3270
</div>
3371

README.md

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,48 @@
66

77
Build excellent AI interfaces and pioneer intelligent new experiences.
88

9-
[![CI status][github-action-image]][github-action-url] [![codecov][codecov-image]][codecov-url] [![NPM version][npm-image]][npm-url]
10-
11-
[![NPM downloads][download-image]][download-url] [![][bundlephobia-image]][bundlephobia-url] [![antd][antd-image]][antd-url] [![Follow zhihu][zhihu-image]][zhihu-url]
12-
13-
[Changelog](./CHANGELOG.md) · [Report a Bug][github-issues-bug-report] · [Request a Feature][github-issues-feature-request] · English · [中文](./README-zh_CN.md)
9+
[![CI status][github-action-image]][github-action-url] [![codecov][codecov-image]][codecov-url] ![GitHub contributors][github-contributors]
10+
11+
| Package | Latest Version | Download stats | Bundle Size | Package Size | JSDelivr |
12+
| :--- | :--- | :--- | :--- | :--- | :--- |
13+
| `@ant-design/x` | [![npm version][x-version-image]][x-version-url] | [![npm downloads][x-downloads-image]][x-downloads-url] | [![bundle size][x-bundle-size-image]][x-bundle-size-url] | [![package size][x-package-size-image]][x-package-size-url] | [![jsdelivr][x-jsdelivr-image]][x-jsdelivr-url] |
14+
| `@ant-design/x-markdown` | [![npm version][x-markdown-version-image]][x-markdown-version-url] | [![npm downloads][x-markdown-downloads-image]][x-markdown-downloads-url] | [![bundle size][x-markdown-bundle-size-image]][x-markdown-bundle-size-url] | [![package size][x-markdown-package-size-image]][x-markdown-package-size-url] | [![jsdelivr][x-markdown-jsdelivr-image]][x-markdown-jsdelivr-url] |
15+
| `@ant-design/x-sdk` | [![npm version][x-sdk-version-image]][x-sdk-version-url] | [![npm downloads][x-sdk-downloads-image]][x-sdk-downloads-url] | [![bundle size][x-sdk-bundle-size-image]][x-sdk-bundle-size-url] | [![package size][x-sdk-package-size-image]][x-sdk-package-size-url] | [![jsdelivr][x-sdk-jsdelivr-image]][x-sdk-jsdelivr-url] |
16+
17+
[Changelog](./CHANGELOG.en-US.md) · [Report a Bug][github-issues-bug-report] · [Request a Feature][github-issues-feature-request] · English · [中文](./README-zh_CN.md)
18+
19+
[x-version-image]: https://img.shields.io/npm/v/@ant-design/x/alpha.svg?style=flat-square
20+
[x-version-url]: https://www.npmjs.com/package/@ant-design/x/v/alpha
21+
[x-downloads-image]: https://img.shields.io/npm/dm/@ant-design/x.svg?style=flat
22+
[x-downloads-url]: https://www.npmjs.com/package/@ant-design/x
23+
[x-bundle-size-image]: https://img.shields.io/bundlephobia/minzip/@ant-design/x
24+
[x-bundle-size-url]: https://bundlephobia.com/result?p=@ant-design/x
25+
[x-package-size-image]: https://packagephobia.com/badge?p=@ant-design/x
26+
[x-package-size-url]: https://packagephobia.com/result?p=@ant-design/x
27+
[x-jsdelivr-image]: https://data.jsdelivr.com/v1/package/npm/@ant-design/x/badge
28+
[x-jsdelivr-url]: https://www.jsdelivr.com/package/npm/@ant-design/x
29+
30+
[x-markdown-version-image]: https://img.shields.io/npm/v/@ant-design/x-markdown.svg?style=flat
31+
[x-markdown-version-url]: https://www.npmjs.com/package/@ant-design/x-markdown
32+
[x-markdown-downloads-image]: https://img.shields.io/npm/dm/@ant-design/x-markdown.svg?style=flat
33+
[x-markdown-downloads-url]: https://www.npmjs.com/package/@ant-design/x-markdown
34+
[x-markdown-bundle-size-image]: https://img.shields.io/bundlephobia/minzip/@ant-design/x-markdown
35+
[x-markdown-bundle-size-url]: https://bundlephobia.com/result?p=@ant-design/x-markdown
36+
[x-markdown-package-size-image]: https://packagephobia.com/badge?p=@ant-design/x-markdown
37+
[x-markdown-package-size-url]: https://packagephobia.com/result?p=@ant-design/x-markdown
38+
[x-markdown-jsdelivr-image]: https://data.jsdelivr.com/v1/package/npm/@ant-design/x-markdown/badge
39+
[x-markdown-jsdelivr-url]: https://www.jsdelivr.com/package/npm/@ant-design/x-markdown
40+
41+
[x-sdk-version-image]: https://img.shields.io/npm/v/@ant-design/x-sdk.svg?style=flat
42+
[x-sdk-version-url]: https://www.npmjs.com/package/@ant-design/x-sdk
43+
[x-sdk-downloads-image]: https://img.shields.io/npm/dm/@ant-design/x-sdk.svg?style=flat
44+
[x-sdk-downloads-url]: https://www.npmjs.com/package/@ant-design/x-sdk
45+
[x-sdk-bundle-size-image]: https://img.shields.io/bundlephobia/minzip/@ant-design/x-sdk
46+
[x-sdk-bundle-size-url]: https://bundlephobia.com/result?p=@ant-design/x-sdk
47+
[x-sdk-package-size-image]: https://packagephobia.com/badge?p=@ant-design/x-sdk
48+
[x-sdk-package-size-url]: https://packagephobia.com/result?p=@ant-design/x-sdk
49+
[x-sdk-jsdelivr-image]: https://data.jsdelivr.com/v1/package/npm/@ant-design/x-sdk/badge
50+
[x-sdk-jsdelivr-url]: https://www.jsdelivr.com/package/npm/@ant-design/x-sdk
1451

1552
[npm-image]: https://img.shields.io/npm/v/@ant-design/x.svg?style=flat-square
1653
[npm-url]: https://npmjs.org/package/@ant-design/x
@@ -28,6 +65,7 @@ Build excellent AI interfaces and pioneer intelligent new experiences.
2865
[antd-url]: https://ant.design
2966
[zhihu-image]: https://img.shields.io/badge/-Ant%20Design-white?logo=zhihu
3067
[zhihu-url]: https://www.zhihu.com/column/c_1564262000561106944
68+
[github-contributors]: https://img.shields.io/github/contributors-anon/ant-design/x
3169

3270
</div>
3371

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "x-mono",
3-
"version": "2.0.0-alpha.8",
3+
"version": "2.0.0-alpha.9",
44
"private": true,
55
"scripts": {
66
"presite": "npm run prestart --workspaces",

packages/x-markdown/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ant-design/x-markdown",
3-
"version": "2.0.0-alpha.8",
3+
"version": "2.0.0-alpha.9",
44
"scripts": {
55
"compile": "father build",
66
"tsc": "tsc --noEmit",

packages/x-markdown/src/XMarkdown/AnimationNode.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { DOMNode } from 'html-react-parser';
12
import React, { useEffect, useRef, useState } from 'react';
23
import { HTMLTag } from './hooks/useAnimation';
34
import { AnimationConfig } from './interface';
@@ -6,6 +7,8 @@ export interface AnimationNodeProps extends React.HTMLAttributes<HTMLElement> {
67
children?: React.ReactNode | React.ReactNode[];
78
nodeTag: HTMLTag;
89
animationConfig?: AnimationConfig;
10+
streamStatus?: 'loading' | 'done';
11+
domNode?: DOMNode;
912
[key: string]: unknown;
1013
}
1114

@@ -55,7 +58,7 @@ const AnimationText = React.memo<AnimationTextProps>((props) => {
5558
});
5659

5760
const AnimationNode: React.FC<AnimationNodeProps> = (props) => {
58-
const { nodeTag, children, animationConfig, _domNode, _streamStatus, ...restProps } = props;
61+
const { nodeTag, children, animationConfig, domNode, streamStatus, ...restProps } = props;
5962

6063
const renderChildren = (): React.ReactNode | React.ReactNode[] => {
6164
if (!children) return null;

packages/x-markdown/src/XMarkdown/__test__/AnimationNode.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,14 @@ describe('AnimationNode Component', () => {
266266
<AnimationNode
267267
nodeTag="p"
268268
data-testid="test-node"
269-
_domNode="test"
270-
_streamStatus="loading"
269+
domNode={{ type: 'tag', name: 'h1' } as any}
270+
streamStatus="loading"
271271
className="should-be-passed"
272272
/>,
273273
);
274274
const node = screen.getByTestId('test-node');
275275
expect(node).toHaveClass('should-be-passed');
276-
expect(node).not.toHaveAttribute('_domNode');
277-
expect(node).not.toHaveAttribute('_streamStatus');
276+
expect(node).not.toHaveAttribute('domNode');
277+
expect(node).not.toHaveAttribute('streamStatus');
278278
});
279279
});

0 commit comments

Comments
 (0)