Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: ConfigProvider merge form validateMessages not inheriting from parent bug #43239

Merged
merged 2 commits into from Jul 6, 2023
Merged

fix: ConfigProvider merge form validateMessages not inheriting from parent bug #43239

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
5e953cd
test(CP): add Form unit case
Wxh16144 Jun 28, 2023
afb445b
fix: `ConfigProvider ` merge form validateMessages not inheriting fr…
Wxh16144 Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 36 additions & 0 deletions components/config-provider/__tests__/form.test.tsx
View file
Open in desktop
Expand Up @@ -148,6 +148,42 @@ describe('ConfigProvider.Form', () => {
'age must be between 18-99',
);
});

// https://github.com/ant-design/ant-design/issues/43210
it('should merge parent ConfigProvider validateMessages', async () => {
const MyForm = () => (
<Form>
<Form.Item name="name" label="Name" rules={[{ required: true }]}>
<Input />
</Form.Item>
<Button type="primary" htmlType="submit">
Submit
</Button>
</Form>
);

const { container, getAllByRole, getAllByText } = render(
<ConfigProvider>
<MyForm />
<ConfigProvider form={{ validateMessages: { required: 'Required' } }}>
<MyForm />
<ConfigProvider>
<MyForm />
</ConfigProvider>
</ConfigProvider>
</ConfigProvider>,
);

const submitButtons = getAllByRole('button');
expect(submitButtons).toHaveLength(3);
submitButtons.forEach(fireEvent.click);

await waitFakeTimer();

expect(container.querySelectorAll('.ant-form-item-explain-error')).toHaveLength(3);
expect(getAllByText('Please enter Name')).toHaveLength(1);
expect(getAllByText('Required')).toHaveLength(2);
});
});

describe('form requiredMark', () => {
Expand Down
2 changes: 2 additions & 0 deletions components/config-provider/context.ts
View file
Open in desktop
@@ -1,4 +1,5 @@
import type { DerivativeFunc } from '@ant-design/cssinjs';
import type { ValidateMessages } from 'rc-field-form/lib/interface';
import * as React from 'react';
import type { Options } from 'scroll-into-view-if-needed';
import type { ButtonProps } from '../button';
Expand Down Expand Up @@ -81,6 +82,7 @@ export interface ConfigConsumerProps {
requiredMark?: RequiredMark;
colon?: boolean;
scrollToFirstError?: Options | boolean;
validateMessages?: ValidateMessages;
};
theme?: ThemeConfig;
select?: {
Expand Down
1 change: 1 addition & 0 deletions components/config-provider/index.tsx
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ const ProviderChildren: React.FC<ProviderChildrenProps> = (props) => {
merge(
defaultLocale.Form?.defaultValidateMessages || {},
memoedConfig.locale?.Form?.defaultValidateMessages || {},
memoedConfig.form?.validateMessages || {},
form?.validateMessages || {},
),
[memoedConfig, form?.validateMessages],
Expand Down