fix: Form validateMessages in nested ConfigProvider (#33705)

close #33691
ant-design · Jan 13, 2022 · 2d484bb · 2d484bb
1 parent a8495ba
commit 2d484bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/components/config-provider/index.tsx b/components/config-provider/index.tsx
@@ -216,9 +216,7 @@ const ProviderChildren: React.FC<ProviderChildrenProps> = props => {
 
   let childNode = children;
   // Additional Form provider
-  let validateMessages: ValidateMessages = {
-    ...defaultLocale.Form?.defaultValidateMessages,
-  };
+  let validateMessages: ValidateMessages = {};
 
   if (locale) {
     validateMessages =

diff --git a/components/form/__tests__/index.test.js b/components/form/__tests__/index.test.js
@@ -13,6 +13,7 @@ import mountTest from '../../../tests/shared/mountTest';
 import rtlTest from '../../../tests/shared/rtlTest';
 import { sleep } from '../../../tests/utils';
 import ConfigProvider from '../../config-provider';
+import zhCN from '../../locale/zh_CN';
 
 jest.mock('scroll-into-view-if-needed');
 
@@ -613,23 +614,25 @@ describe('Form', () => {
     expect(wrapper.find('.ant-form-item-explain').first().text()).toEqual('Bamboo is good!');
   });
 
-  it('should have default validateMessages in default locale', async () => {
+  // https://github.com/ant-design/ant-design/issues/33691
+  it('should keep upper locale in nested ConfigProvider', async () => {
     const wrapper = mount(
-      // eslint-disable-next-line no-template-curly-in-string
-      <ConfigProvider>
-        <Form>
-          <Form.Item name="test" label="Bamboo" rules={[{ required: true }]}>
-            <input />
-          </Form.Item>
-        </Form>
+      <ConfigProvider locale={zhCN}>
+        <ConfigProvider>
+          <Form>
+            <Form.Item name="test" label="Bamboo" rules={[{ required: true }]}>
+              <input />
+            </Form.Item>
+          </Form>
+        </ConfigProvider>
       </ConfigProvider>,
     );
 
     wrapper.find('form').simulate('submit');
     await sleep(100);
     wrapper.update();
     await sleep(100);
-    expect(wrapper.find('.ant-form-item-explain').first().text()).toEqual('Please enter Bamboo');
+    expect(wrapper.find('.ant-form-item-explain').first().text()).toEqual('请输入Bamboo');
   });
 
   it('`name` support template when label is not provided', async () => {