From 7a4cbf2c36b1da44773e4b560a72dc12a4055d80 Mon Sep 17 00:00:00 2001
From: MadCcc <1075746765@qq.com>
Date: Mon, 21 Feb 2022 20:01:27 +0800
Subject: [PATCH] fix: should display text properly if text is number 0

---
 src/OptionList.tsx    | 15 ++++-----------
 tests/Select.test.tsx | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 4162743bd..9de61eae5 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -31,16 +31,8 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
   _,
   ref,
 ) => {
-  const {
-    prefixCls,
-    id,
-    open,
-    multiple,
-    searchValue,
-    toggleOpen,
-    notFoundContent,
-    onPopupScroll,
-  } = useBaseProps();
+  const { prefixCls, id, open, multiple, searchValue, toggleOpen, notFoundContent, onPopupScroll } =
+    useBaseProps();
   const {
     flattenOptions,
     onActiveValue,
@@ -306,7 +298,8 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
           const iconVisible =
             !menuItemSelectedIcon || typeof menuItemSelectedIcon === 'function' || selected;
 
-          const content = mergedLabel || value;
+          // https://github.com/ant-design/ant-design/issues/34145
+          const content = typeof mergedLabel === 'number' ? mergedLabel : mergedLabel || value;
           // https://github.com/ant-design/ant-design/issues/26717
           let optionTitle =
             typeof content === 'string' || typeof content === 'number'
diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
index 2105312e0..143535bdd 100644
--- a/tests/Select.test.tsx
+++ b/tests/Select.test.tsx
@@ -506,6 +506,25 @@ describe('Select.Basic', () => {
     jest.useRealTimers();
   });
 
+  it('should render 0 as text properly', () => {
+    const data = [
+      { text: 0, value: '=0' },
+      { text: 1, value: '=1' },
+    ];
+
+    const wrapper = mount(
+      <Select style={{ width: 120 }} open>
+        {data.map((d) => (
+          <Select.Option value={d.value} key={d.value}>
+            {d.text}
+          </Select.Option>
+        ))}
+      </Select>,
+    );
+
+    expect(wrapper.find('.rc-select-item-option-content').first().text()).toEqual('0');
+  });
+
   describe('focus', () => {
     let handleFocus;
     let wrapper;