From 77ecdcba8ba4471891d4bea709ddbb6e961ceb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kiner-tang=28=E6=96=87=E8=BE=89=29?= <1127031143@qq.com> Date: Mon, 7 Aug 2023 18:05:34 +0800 Subject: [PATCH] feat(DatePicker): RangePicker support rootClassName (#44057) * feat: RangePicker support rootClassName * feat: optimize code * feat: optimize code * feat: optimize code --- components/date-picker/__tests__/demo.test.tsx | 11 ++++++++++- .../generatePicker/generateRangePicker.tsx | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/components/date-picker/__tests__/demo.test.tsx b/components/date-picker/__tests__/demo.test.tsx index e249126e32ea..db64682abc4a 100644 --- a/components/date-picker/__tests__/demo.test.tsx +++ b/components/date-picker/__tests__/demo.test.tsx @@ -4,7 +4,16 @@ import demoTest, { rootPropsTest } from '../../../tests/shared/demoTest'; demoTest('date-picker', { skip: ['locale.tsx'], testRootProps: false }); -rootPropsTest('time-picker', (DatePicker, props) => , { +rootPropsTest('date-picker', (DatePicker, props) => , { findRootElements: () => document.querySelectorAll('.ant-picker, .ant-picker-dropdown'), expectCount: 2, }); + +rootPropsTest( + 'date-picker', + (DatePicker, props) => , + { + findRootElements: () => document.querySelectorAll('.ant-picker-range, .ant-picker-dropdown'), + expectCount: 2, + }, +); diff --git a/components/date-picker/generatePicker/generateRangePicker.tsx b/components/date-picker/generatePicker/generateRangePicker.tsx index 503f2806ddfb..28ec17584e06 100644 --- a/components/date-picker/generatePicker/generateRangePicker.tsx +++ b/components/date-picker/generatePicker/generateRangePicker.tsx @@ -36,6 +36,7 @@ export default function generateRangePicker(generateConfig: GenerateCo */ dropdownClassName?: string; popupClassName?: string; + rootClassName?: string; }; const RangePicker = forwardRef< @@ -56,6 +57,7 @@ export default function generateRangePicker(generateConfig: GenerateCo status: customStatus, clearIcon, allowClear, + rootClassName, ...restProps } = props; @@ -139,6 +141,7 @@ export default function generateRangePicker(generateConfig: GenerateCo hashId, compactItemClassnames, className, + rootClassName, )} locale={locale.lang} prefixCls={prefixCls} @@ -146,7 +149,7 @@ export default function generateRangePicker(generateConfig: GenerateCo generateConfig={generateConfig} components={Components} direction={direction} - dropdownClassName={classNames(hashId, popupClassName || dropdownClassName)} + dropdownClassName={classNames(hashId, popupClassName || dropdownClassName, rootClassName)} allowClear={mergeAllowClear(allowClear, clearIcon, )} />, );