Skip to content

Commit 76264c4

Browse files
chore: auto merge branches (#59779)
chore: master merge feature
2 parents 46f0421 + e289070 commit 76264c4

417 files changed

Lines changed: 119106 additions & 9287 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dumi/theme/common/Markers.tsx‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const Markers: React.FC<MarkersProps> = (props) => {
2323

2424
// ======================== Effect =========================
2525
React.useEffect(() => {
26+
const canObserve = typeof IntersectionObserver !== 'undefined';
2627
const allElements = targetClassName
2728
? Array.from(containerRef.current?.querySelectorAll<HTMLElement>(`.${targetClassName}`) || [])
2829
: [];
@@ -56,7 +57,7 @@ const Markers: React.FC<MarkersProps> = (props) => {
5657
top: rect.top - (containerRect.top || 0),
5758
width: rect.width,
5859
height: rect.height,
59-
visible: isVisible(targetElement),
60+
visible: !canObserve && isVisible(targetElement),
6061
};
6162
});
6263

@@ -75,6 +76,48 @@ const Markers: React.FC<MarkersProps> = (props) => {
7576
},
7677
);
7778
});
79+
80+
if (!canObserve) {
81+
return;
82+
}
83+
84+
let destroyed = false;
85+
const observer = new IntersectionObserver(
86+
(entries) => {
87+
if (destroyed) {
88+
return;
89+
}
90+
91+
setRectList((prev) => {
92+
const next = [...prev];
93+
94+
entries.forEach((entry) => {
95+
const index = targetElements.indexOf(entry.target as HTMLElement);
96+
if (index !== -1 && next[index]) {
97+
next[index] = {
98+
...next[index],
99+
visible:
100+
entry.isIntersecting &&
101+
entry.intersectionRatio > 0 &&
102+
isVisible(entry.target as HTMLElement),
103+
};
104+
}
105+
});
106+
107+
return next;
108+
});
109+
},
110+
{ root: containerRef.current },
111+
);
112+
113+
targetElements.forEach((element) => {
114+
observer.observe(element);
115+
});
116+
117+
return () => {
118+
destroyed = true;
119+
observer.disconnect();
120+
};
78121
}, [containerRef, targetClassName]);
79122

80123
// ======================== Render =========================

‎components/__tests__/17.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
jest.mock('../_util/getReactMajorVersionCanDelMe', () => {
2-
return () => 17;
1+
jest.mock('../_util/getReactVersionCanDelMe', () => {
2+
return () => [17, 0, 0];
33
});
44

55
describe('antd legacy', () => {
Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
import React from 'react';
2+
import userEvent from '@testing-library/user-event';
3+
4+
import { fireEvent, render } from '../../../tests/utils';
5+
import ConfigProvider from '../../config-provider';
6+
import Input from '../../input';
7+
import InputNumber from '../../input-number';
8+
import zhCN from '../../locale/zh_CN';
9+
import Mentions from '../../mentions';
10+
import type { AllowClear } from '../hooks';
11+
12+
describe.each([
13+
{ name: 'Input', Component: Input, configKey: 'input' },
14+
{ name: 'TextArea', Component: Input.TextArea, configKey: 'textArea' },
15+
{ name: 'Mentions', Component: Mentions, configKey: 'mentions' },
16+
] as const)('$name allowClear.tabIndex', ({ Component, configKey }) => {
17+
it('keeps the clear button keyboard accessible by default', async () => {
18+
const user = userEvent.setup();
19+
const { getByRole } = render(
20+
<Component defaultValue="value" allowClear={{ clearIcon: 'Clear' }} />,
21+
);
22+
23+
await user.tab();
24+
expect(getByRole('textbox')).toHaveFocus();
25+
await user.tab();
26+
expect(getByRole('button', { name: 'Clear' })).toHaveFocus();
27+
await user.keyboard('{Enter}');
28+
expect(getByRole('textbox')).toHaveValue('');
29+
});
30+
31+
it('skips the clear button with tabIndex -1 and still allows clicking to clear', async () => {
32+
const user = userEvent.setup();
33+
const onClear = jest.fn();
34+
const { getByRole } = render(
35+
<>
36+
<Component
37+
aria-label="Value"
38+
defaultValue="value"
39+
allowClear={{ clearIcon: 'Clear', tabIndex: -1 }}
40+
onClear={onClear}
41+
/>
42+
<input aria-label="Next" />
43+
</>,
44+
);
45+
46+
await user.tab();
47+
expect(getByRole('textbox', { name: 'Value' })).toHaveFocus();
48+
await user.tab();
49+
expect(getByRole('textbox', { name: 'Next' })).toHaveFocus();
50+
await user.tab({ shift: true });
51+
expect(getByRole('textbox', { name: 'Value' })).toHaveFocus();
52+
await user.click(getByRole('button', { name: 'Clear' }));
53+
expect(getByRole('textbox', { name: 'Value' })).toHaveValue('');
54+
expect(getByRole('textbox', { name: 'Value' })).toHaveFocus();
55+
expect(onClear).toHaveBeenCalledTimes(1);
56+
});
57+
58+
it('inherits the global tabIndex and lets the component override it with 0', () => {
59+
const Demo = ({ allowClear }: { allowClear?: AllowClear }) => (
60+
<ConfigProvider {...{ [configKey]: { allowClear: { clearIcon: 'Clear', tabIndex: -1 } } }}>
61+
<Component defaultValue="value" allowClear={allowClear} />
62+
</ConfigProvider>
63+
);
64+
const { getByRole, queryByRole, rerender } = render(<Demo />);
65+
expect(getByRole('button', { name: 'Clear' })).toHaveAttribute('tabindex', '-1');
66+
67+
rerender(<Demo allowClear />);
68+
expect(getByRole('button', { name: 'Clear' })).toHaveAttribute('tabindex', '-1');
69+
70+
rerender(<Demo allowClear={{ tabIndex: 0 }} />);
71+
expect(getByRole('button', { name: 'Clear' })).toHaveAttribute('tabindex', '0');
72+
73+
rerender(<Demo allowClear={false} />);
74+
expect(queryByRole('button', { name: 'Clear' })).not.toBeInTheDocument();
75+
});
76+
});
77+
78+
type ClearProps = { allowClear?: AllowClear; onClear?: () => void };
79+
const clearCases = [
80+
{
81+
name: 'Input',
82+
configKey: 'input',
83+
render: (props: ClearProps) => <Input defaultValue="value" {...props} />,
84+
},
85+
{
86+
name: 'TextArea',
87+
configKey: 'textArea',
88+
render: (props: ClearProps) => <Input.TextArea defaultValue="value" {...props} />,
89+
},
90+
{
91+
name: 'Search',
92+
configKey: 'input',
93+
render: (props: ClearProps) => <Input.Search defaultValue="value" {...props} />,
94+
},
95+
{
96+
name: 'Password',
97+
configKey: 'input',
98+
render: (props: ClearProps) => <Input.Password defaultValue="value" {...props} />,
99+
},
100+
{
101+
name: 'Mentions',
102+
configKey: 'mentions',
103+
render: (props: ClearProps) => <Mentions defaultValue="value" {...props} />,
104+
},
105+
{
106+
name: 'InputNumber',
107+
configKey: 'inputNumber',
108+
render: (props: ClearProps) => <InputNumber defaultValue={0} {...props} />,
109+
},
110+
] as const;
111+
112+
describe.each(clearCases)('$name unified allowClear', ({ configKey, render: renderComponent }) => {
113+
it('removes the clear entry when disabled and restores its configuration when enabled', () => {
114+
const onClear = jest.fn();
115+
const config = {
116+
clearIcon: <span data-testid="clear-icon">Custom</span>,
117+
label: 'Remove value',
118+
tabIndex: -1,
119+
};
120+
const { getByRole, queryByRole, queryByTestId, rerender } = render(
121+
renderComponent({ allowClear: config, onClear }),
122+
);
123+
expect(getByRole('button', { name: 'Remove value' })).toHaveAttribute('tabindex', '-1');
124+
rerender(renderComponent({ allowClear: { ...config, disabled: true }, onClear }));
125+
expect(queryByRole('button', { name: 'Remove value', hidden: true })).not.toBeInTheDocument();
126+
expect(queryByTestId('clear-icon')).not.toBeInTheDocument();
127+
expect(onClear).not.toHaveBeenCalled();
128+
rerender(renderComponent({ allowClear: { ...config, disabled: false }, onClear }));
129+
expect(getByRole('button', { name: 'Remove value' })).toHaveAttribute('tabindex', '-1');
130+
expect(queryByTestId('clear-icon')).toBeInTheDocument();
131+
fireEvent.click(getByRole('button', { name: 'Remove value' }));
132+
expect(onClear).toHaveBeenCalledTimes(1);
133+
});
134+
135+
it('updates the localized label and preserves an explicit label', () => {
136+
const Demo = ({
137+
chinese,
138+
allowClear = true,
139+
}: {
140+
chinese?: boolean;
141+
allowClear?: AllowClear;
142+
}) => (
143+
<ConfigProvider locale={chinese ? zhCN : undefined}>
144+
{renderComponent({ allowClear })}
145+
</ConfigProvider>
146+
);
147+
const { getByRole, rerender } = render(<Demo />);
148+
expect(getByRole('button', { name: 'Clear' })).toBeInTheDocument();
149+
rerender(<Demo chinese />);
150+
expect(getByRole('button', { name: '清除' })).toBeInTheDocument();
151+
rerender(<Demo chinese allowClear={{ label: 'Remove value' }} />);
152+
expect(getByRole('button', { name: 'Remove value' })).toBeInTheDocument();
153+
});
154+
155+
if (configKey) {
156+
it('merges fields before normalization and preserves explicit false and zero overrides', () => {
157+
const contextAllowClear = {
158+
clearIcon: <span data-testid="global-clear">Custom</span>,
159+
disabled: true,
160+
tabIndex: -1,
161+
label: 'Global clear',
162+
};
163+
const Demo = ({ allowClear }: ClearProps) => (
164+
<ConfigProvider {...{ [configKey]: { allowClear: contextAllowClear } }}>
165+
{renderComponent({ allowClear })}
166+
</ConfigProvider>
167+
);
168+
const { getByRole, queryByTestId, rerender } = render(<Demo />);
169+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
170+
rerender(<Demo allowClear />);
171+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
172+
rerender(<Demo allowClear={{ tabIndex: 0 }} />);
173+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
174+
rerender(<Demo allowClear={{ disabled: false }} />);
175+
expect(getByRole('button', { name: 'Global clear' })).toHaveAttribute('tabindex', '-1');
176+
expect(queryByTestId('global-clear')).toBeInTheDocument();
177+
rerender(<Demo allowClear={{ disabled: false, tabIndex: 0, label: 'Local clear' }} />);
178+
expect(getByRole('button', { name: 'Local clear' })).toHaveAttribute('tabindex', '0');
179+
expect(queryByTestId('global-clear')).toBeInTheDocument();
180+
rerender(<Demo allowClear={false} />);
181+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
182+
});
183+
}
184+
});
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
import React from 'react';
2+
import dayjs from 'dayjs';
3+
4+
import { fireEvent, render } from '../../../tests/utils';
5+
import ConfigProvider from '../../config-provider';
6+
import DatePicker from '../../date-picker';
7+
import zhCN from '../../locale/zh_CN';
8+
import TimePicker from '../../time-picker';
9+
import type { AllowClear } from '../hooks';
10+
11+
const date = dayjs('2026-10-13');
12+
type ClearProps = { allowClear?: AllowClear; onClear?: () => void };
13+
const clearCases = [
14+
{
15+
name: 'DatePicker',
16+
configKey: 'datePicker',
17+
render: (props: ClearProps) => <DatePicker defaultValue={date} {...props} />,
18+
},
19+
{
20+
name: 'RangePicker',
21+
configKey: 'datePicker',
22+
render: (props: ClearProps) => (
23+
<DatePicker.RangePicker defaultValue={[date, date]} {...props} />
24+
),
25+
},
26+
{
27+
name: 'TimePicker',
28+
configKey: 'timePicker',
29+
render: (props: ClearProps) => <TimePicker defaultValue={date} {...props} />,
30+
},
31+
{
32+
name: 'TimeRangePicker',
33+
configKey: 'timePicker',
34+
render: (props: ClearProps) => (
35+
<TimePicker.RangePicker defaultValue={[date, date]} {...props} />
36+
),
37+
},
38+
] as const;
39+
40+
describe.each(clearCases)('$name unified allowClear', ({ configKey, render: renderComponent }) => {
41+
it('removes the clear entry when disabled and restores its configuration when enabled', () => {
42+
const onClear = jest.fn();
43+
const config = {
44+
clearIcon: <span data-testid="clear-icon">Custom</span>,
45+
label: 'Remove value',
46+
tabIndex: -1,
47+
};
48+
const { getByRole, queryByRole, queryByTestId, rerender } = render(
49+
renderComponent({ allowClear: config, onClear }),
50+
);
51+
expect(getByRole('button', { name: 'Remove value' })).toHaveAttribute('tabindex', '-1');
52+
rerender(renderComponent({ allowClear: { ...config, disabled: true }, onClear }));
53+
expect(queryByRole('button', { name: 'Remove value', hidden: true })).not.toBeInTheDocument();
54+
expect(queryByTestId('clear-icon')).not.toBeInTheDocument();
55+
expect(onClear).not.toHaveBeenCalled();
56+
rerender(renderComponent({ allowClear: { ...config, disabled: false }, onClear }));
57+
expect(getByRole('button', { name: 'Remove value' })).toHaveAttribute('tabindex', '-1');
58+
expect(queryByTestId('clear-icon')).toBeInTheDocument();
59+
fireEvent.click(getByRole('button', { name: 'Remove value' }));
60+
expect(onClear).toHaveBeenCalledTimes(1);
61+
});
62+
63+
it('updates the localized label and preserves an explicit label', () => {
64+
const Demo = ({
65+
chinese,
66+
allowClear = true,
67+
}: {
68+
chinese?: boolean;
69+
allowClear?: AllowClear;
70+
}) => (
71+
<ConfigProvider locale={chinese ? zhCN : undefined}>
72+
{renderComponent({ allowClear })}
73+
</ConfigProvider>
74+
);
75+
const { getByRole, rerender } = render(<Demo />);
76+
expect(getByRole('button', { name: 'Clear' })).toBeInTheDocument();
77+
rerender(<Demo chinese />);
78+
expect(getByRole('button', { name: '清除' })).toBeInTheDocument();
79+
rerender(<Demo chinese allowClear={{ label: 'Remove value' }} />);
80+
expect(getByRole('button', { name: 'Remove value' })).toBeInTheDocument();
81+
});
82+
83+
if (configKey) {
84+
it('merges fields before normalization and preserves explicit false and zero overrides', () => {
85+
const contextAllowClear = {
86+
clearIcon: <span data-testid="global-clear">Custom</span>,
87+
disabled: true,
88+
tabIndex: -1,
89+
label: 'Global clear',
90+
};
91+
const Demo = ({ allowClear }: ClearProps) => (
92+
<ConfigProvider {...{ [configKey]: { allowClear: contextAllowClear } }}>
93+
{renderComponent({ allowClear })}
94+
</ConfigProvider>
95+
);
96+
const { getByRole, queryByTestId, rerender } = render(<Demo />);
97+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
98+
rerender(<Demo allowClear />);
99+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
100+
rerender(<Demo allowClear={{ tabIndex: 0 }} />);
101+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
102+
rerender(<Demo allowClear={{ disabled: false }} />);
103+
expect(getByRole('button', { name: 'Global clear' })).toHaveAttribute('tabindex', '-1');
104+
expect(queryByTestId('global-clear')).toBeInTheDocument();
105+
rerender(<Demo allowClear={{ disabled: false, tabIndex: 0, label: 'Local clear' }} />);
106+
expect(getByRole('button', { name: 'Local clear' })).toHaveAttribute('tabindex', '0');
107+
expect(queryByTestId('global-clear')).toBeInTheDocument();
108+
rerender(<Demo allowClear={false} />);
109+
expect(queryByTestId('global-clear')).not.toBeInTheDocument();
110+
});
111+
}
112+
});
113+
114+
it('uses the picker locale as the default clear label', () => {
115+
const locale = { ...zhCN.DatePicker!, lang: { ...zhCN.DatePicker!.lang, clear: 'Clear date' } };
116+
const { getByRole, rerender } = render(<DatePicker defaultValue={date} locale={locale} />);
117+
expect(getByRole('button', { name: 'Clear date' })).toBeInTheDocument();
118+
rerender(<DatePicker.RangePicker defaultValue={[date, date]} locale={locale} />);
119+
expect(getByRole('button', { name: 'Clear date' })).toBeInTheDocument();
120+
});

0 commit comments

Comments
 (0)