From bf87fc29623b574be2a083cc318ba1f5c0bc85e9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 23 Nov 2021 14:41:59 +0800 Subject: [PATCH 1/3] use import export type syntax --- src/index.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index 686e2d739..74bfc799f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,8 +1,10 @@ -import Select, { ExportedSelectProps as SelectProps } from './Select'; -import { RefSelectProps } from './generate'; +import Select from './Select'; import Option from './Option'; import OptGroup from './OptGroup'; +import type { ExportedSelectProps as SelectProps } from './Select'; +import type { RefSelectProps } from './generate'; -export { Option, OptGroup, SelectProps, RefSelectProps }; +export { Option, OptGroup }; +export type { SelectProps, RefSelectProps }; export default Select; From 1a444e6a1c5eb685c179bcff1c7ed2a328cb1fba Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 23 Nov 2021 15:08:33 +0800 Subject: [PATCH 2/3] fix: select placeholder should take place when searching https://github.com/ant-design/ant-design/issues/27688 --- src/Selector/SingleSelector.tsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Selector/SingleSelector.tsx b/src/Selector/SingleSelector.tsx index b6123a7a2..86768b2fd 100644 --- a/src/Selector/SingleSelector.tsx +++ b/src/Selector/SingleSelector.tsx @@ -63,6 +63,18 @@ const SingleSelector: React.FC = (props) => { ? item.label.toString() : undefined; + const renderPlaceholder = () => { + if (item) { + return null; + } + const hiddenStyle = hasTextInput ? { visibility: 'hidden' as const } : undefined; + return ( + + {placeholder} + + ); + }; + return ( <> @@ -101,9 +113,7 @@ const SingleSelector: React.FC = (props) => { )} {/* Display placeholder */} - {!item && !hasTextInput && ( - {placeholder} - )} + {renderPlaceholder()} ); }; From a1766b57ef8c58bd15a6c1085190bc94968679aa Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 23 Nov 2021 15:18:19 +0800 Subject: [PATCH 3/3] fix test case --- tests/Select.test.tsx | 9 +++++++-- tests/__snapshots__/Select.test.tsx.snap | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx index dd808cd85..598533b1d 100644 --- a/tests/Select.test.tsx +++ b/tests/Select.test.tsx @@ -1615,9 +1615,14 @@ describe('Select.Basic', () => { describe('show placeholder', () => { it('when searchValue is controlled', () => { const wrapper = mount(