From cefb877ab969cf62462143b209d6ac8bb77580b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Wed, 16 Sep 2020 11:51:55 +0800 Subject: [PATCH] fix: AutoComplete warning when using placeholder and allowClear (#26765) close #26760 --- components/auto-complete/__tests__/index.test.js | 9 +++++++++ components/auto-complete/index.tsx | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/components/auto-complete/__tests__/index.test.js b/components/auto-complete/__tests__/index.test.js index ec6c68883f..8ede6d19ff 100644 --- a/components/auto-complete/__tests__/index.test.js +++ b/components/auto-complete/__tests__/index.test.js @@ -69,4 +69,13 @@ describe('AutoComplete', () => { wrapper.find('input').simulate('change', { target: { value: '1' } }); expect(wrapper.find('.ant-select-item-option').length).toBe(2); }); + + it('should not warning when getInputElement is null', () => { + jest.spyOn(console, 'warn').mockImplementation(() => undefined); + mount(); + // eslint-disable-next-line no-console + expect(console.warn).not.toBeCalled(); + // eslint-disable-next-line no-console + console.warn.mockRestore(); + }); }); diff --git a/components/auto-complete/index.tsx b/components/auto-complete/index.tsx index e4b63d69f9..1e88654e94 100755 --- a/components/auto-complete/index.tsx +++ b/components/auto-complete/index.tsx @@ -46,7 +46,7 @@ const AutoComplete: React.ForwardRefRenderFunction = React.useImperativeHandle(ref, () => selectRef.current!); // ============================= Input ============================= - let customizeInput: React.ReactElement; + let customizeInput: React.ReactElement | undefined; if ( childNodes.length === 1 && @@ -56,7 +56,7 @@ const AutoComplete: React.ForwardRefRenderFunction = [customizeInput] = childNodes; } - const getInputElement = (): React.ReactElement => customizeInput; + const getInputElement = customizeInput ? (): React.ReactElement => customizeInput! : undefined; // ============================ Options ============================ let optionChildren: React.ReactNode; -- GitLab