From 2bd34be8b0d70f415c2b680d4e70912de2066ba0 Mon Sep 17 00:00:00 2001
From: "dian.li" <dian.li@yunzhanghu.com>
Date: Wed, 23 Nov 2022 10:03:23 +0800
Subject: [PATCH 1/2] bugfix(DisabledContextProvider): fix disabled logic

---
 components/config-provider/DisabledContext.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/config-provider/DisabledContext.tsx b/components/config-provider/DisabledContext.tsx
index 2f044e6d9864..199dd8e36de0 100644
--- a/components/config-provider/DisabledContext.tsx
+++ b/components/config-provider/DisabledContext.tsx
@@ -12,7 +12,7 @@ export interface DisabledContextProps {
 export const DisabledContextProvider: React.FC<DisabledContextProps> = ({ children, disabled }) => {
   const originDisabled = React.useContext(DisabledContext);
   return (
-    <DisabledContext.Provider value={disabled || originDisabled}>
+    <DisabledContext.Provider value={disabled ?? originDisabled}>
       {children}
     </DisabledContext.Provider>
   );

From c3ee40d0f9905a1287a8c5f1ae53ed27bb6138da Mon Sep 17 00:00:00 2001
From: "dian.li" <dian.li@yunzhanghu.com>
Date: Wed, 23 Nov 2022 10:46:31 +0800
Subject: [PATCH 2/2] test: add test for ConfigProvider componentDisabled

---
 .../config-provider/__tests__/form.test.tsx   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/components/config-provider/__tests__/form.test.tsx b/components/config-provider/__tests__/form.test.tsx
index db5ae00f852e..123c3c4936e3 100644
--- a/components/config-provider/__tests__/form.test.tsx
+++ b/components/config-provider/__tests__/form.test.tsx
@@ -4,6 +4,7 @@ import ConfigProvider from '..';
 import { render } from '../../../tests/utils';
 import type { FormInstance } from '../../form';
 import Form from '../../form';
+import Input from '../../input';
 import zhCN from '../../locale/zh_CN';
 
 describe('ConfigProvider.Form', () => {
@@ -125,4 +126,24 @@ describe('ConfigProvider.Form', () => {
       expect(container.querySelector('.ant-form-item-no-colon')).toBeFalsy();
     });
   });
+
+  describe('form disabled', () => {
+    it('set Input enabled', () => {
+      const { container } = render(
+        <Form disabled>
+          <ConfigProvider componentDisabled={false}>
+            <Form.Item name="input1" label="启用">
+              <Input />
+            </Form.Item>
+          </ConfigProvider>
+          <Form.Item name="input" label="禁用">
+            <Input />
+          </Form.Item>
+        </Form>,
+      );
+
+      expect(container.querySelector('#input1[disabled]')).toBeFalsy();
+      expect(container.querySelector('#input[disabled]')).toBeTruthy();
+    });
+  });
 });