Skip to content

[pull] master from ant-design:master #1270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 21, 2026
Merged

[pull] master from ant-design:master #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
482ccda
fix(Descriptions): preserve item state when key is 0 (#59064)
QDyanbing Aug 21, 2026
2b25815
Revert "site: fix code-box style with Badge" (#59065)
li-jia-nan Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .dumi/theme/common/styles/Demo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const GlobalDemoStyles: React.FC = () => {
.code-box {
position: relative;
display: inline-block;
/* width: calc(100% - ${token.lineWidth * 2}px); */
width: 100%;
width: calc(100% - ${token.lineWidth * 2}px);
margin: 0 0 ${token.margin}px;
background-color: ${token.colorBgContainer};
border: 1px solid ${token.colorSplit};
border: ${token.lineWidth}px ${token.lineType} ${token.colorSplit};
border-radius: ${token.borderRadiusLG}px;
transition: all ${token.motionDurationMid};
box-sizing: content-box;

&.code-box-simplify {
border-radius: 0;
Expand Down
8 changes: 5 additions & 3 deletions components/descriptions/Row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ function renderCells(
},
index,
) => {
const mergedKey = key ?? index;

if (typeof component === 'string') {
return (
<Cell
key={`${type}-${key || index}`}
key={`${type}-${mergedKey}`}
className={className}
style={style}
classNames={classNames}
Expand Down Expand Up @@ -91,7 +93,7 @@ function renderCells(
};
return [
<Cell
key={`label-${key || index}`}
key={`label-${mergedKey}`}
className={className}
style={style}
classNames={classNames}
Expand All @@ -105,7 +107,7 @@ function renderCells(
type="label"
/>,
<Cell
key={`content-${key || index}`}
key={`content-${mergedKey}`}
className={className}
style={style}
classNames={classNames}
Expand Down
27 changes: 25 additions & 2 deletions components/descriptions/__tests__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React from 'react';
import MockDate from 'mockdate';

import Descriptions from '..';
import { matchScreen } from '../../_util/responsiveObserver';
import { resetWarned } from '../../_util/warning';
import mountTest from '../../../tests/shared/mountTest';
import { render } from '../../../tests/utils';
import { fireEvent, render } from '../../../tests/utils';
import ConfigProvider from '../../config-provider';
import { matchScreen } from '../../_util/responsiveObserver';
import DEFAULT_COLUMN_MAP from '../constant';

describe('Descriptions', () => {
Expand Down Expand Up @@ -284,6 +284,29 @@ describe('Descriptions', () => {
expect(jest.spyOn(document, 'createElement')).not.toHaveBeenCalled();
});

it('should preserve item state after reordering when key is 0', () => {
const items = [
{
key: 0,
label: 'Zero',
children: <input aria-label="Zero value" defaultValue="zero" />,
},
{
key: 2,
label: 'Two',
children: <input aria-label="Two value" defaultValue="two" />,
},
];
const { getByLabelText, rerender } = render(<Descriptions column={2} items={items} />);
const input = getByLabelText('Zero value');

fireEvent.change(input, { target: { value: 'edited' } });
rerender(<Descriptions column={2} items={[...items].reverse()} />);

expect(getByLabelText('Zero value')).toBe(input);
expect(getByLabelText('Zero value')).toHaveValue('edited');
});

// https://github.com/ant-design/ant-design/issues/19887
it('should work with React Fragment', () => {
if (!React.Fragment) {
Expand Down
Loading