feat(DatePicker): RangePicker support rootClassName (ant-design#44057)

* feat: RangePicker support rootClassName * feat: optimize code * feat: optimize code * feat: optimize code
ammar-knowledge · Aug 7, 2023 · 77ecdcb · 77ecdcb
1 parent 915514f
commit 77ecdcb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git 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) => <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,
+  },
+);
diff --git a/components/date-picker/generatePicker/generateRangePicker.tsx b/components/date-picker/generatePicker/generateRangePicker.tsx
@@ -36,6 +36,7 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
      */
     dropdownClassName?: string;
     popupClassName?: string;
+    rootClassName?: string;
   };
 
   const RangePicker = forwardRef<
@@ -56,6 +57,7 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
       status: customStatus,
       clearIcon,
       allowClear,
+      rootClassName,
       ...restProps
     } = props;
 
@@ -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 />)}
       />,
     );