Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(DatePicker): RangePicker support rootClassName #44057

Merged
merged 4 commits into from
Aug 7, 2023
Merged

feat(DatePicker): RangePicker support rootClassName #44057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c0f90b
feat: RangePicker support rootClassName
kiner-tang Aug 6, 2023
e19e61b
feat: optimize code
kiner-tang Aug 7, 2023
d6fe6b5
feat: optimize code
kiner-tang Aug 7, 2023
aa76ed8
feat: optimize code
kiner-tang Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion components/date-picker/__tests__/demo.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@ import demoTest, { rootPropsTest } from '../../../tests/shared/demoTest';

demoTest('date-picker', { skip: ['locale.tsx'], testRootProps: false });

rootPropsTest('time-picker', (DatePicker, props) => <DatePicker {...props} value={dayjs()} />, {
rootPropsTest('date-picker', (DatePicker, props) => <DatePicker {...props} value={dayjs()} />, {
findRootElements: () => document.querySelectorAll('.ant-picker, .ant-picker-dropdown'),
expectCount: 2,
});

rootPropsTest(
'date-picker',
(DatePicker, props) => <DatePicker.RangePicker {...props} value={dayjs()} />,
{
findRootElements: () => document.querySelectorAll('.ant-picker-range, .ant-picker-dropdown'),
expectCount: 2,
},
);
5 changes: 4 additions & 1 deletion components/date-picker/generatePicker/generateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
*/
dropdownClassName?: string;
popupClassName?: string;
rootClassName?: string;
};

const RangePicker = forwardRef<
Expand All @@ -56,6 +57,7 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
status: customStatus,
clearIcon,
allowClear,
rootClassName,
...restProps
} = props;

Expand Down Expand Up @@ -139,14 +141,15 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
hashId,
compactItemClassnames,
className,
rootClassName,
)}
locale={locale.lang}
prefixCls={prefixCls}
getPopupContainer={customGetPopupContainer || getPopupContainer}
generateConfig={generateConfig}
components={Components}
direction={direction}
dropdownClassName={classNames(hashId, popupClassName || dropdownClassName)}
dropdownClassName={classNames(hashId, popupClassName || dropdownClassName, rootClassName)}
allowClear={mergeAllowClear(allowClear, clearIcon, <CloseCircleFilled />)}
/>,
);
Expand Down