fix: RangePicker.defaultPickerValue has no effect if showTime is set (#291)

Author: thommesZip

src/PickerPanel.tsx

@@ -101,7 +101,8 @@ export type PickerPanelDateProps<DateType> = {
 
 export type PickerPanelTimeProps<DateType> = {
   picker: 'time';
-} & PickerPanelSharedProps<DateType> & SharedTimeProps<DateType>;
+} & PickerPanelSharedProps<DateType> &
+  SharedTimeProps<DateType>;
 
 export type PickerPanelProps<DateType> =
   | PickerPanelBaseProps<DateType>
@@ -208,12 +209,16 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
       // When value is null and set showTime
       if (!mergedValue && showTime) {
         if (typeof showTime === 'object') {
-          return setDateTime(generateConfig, date, showTime.defaultValue || now);
+          return setDateTime(
+            generateConfig,
+            Array.isArray(date) ? date[0] : date,
+            showTime.defaultValue || now,
+          );
         }
         if (defaultValue) {
-          return setDateTime(generateConfig, date, defaultValue);
+          return setDateTime(generateConfig, Array.isArray(date) ? date[0] : date, defaultValue);
         }
-        return setDateTime(generateConfig, date, now);
+        return setDateTime(generateConfig, Array.isArray(date) ? date[0] : date, now);
       }
       return date;
     },

src/RangePicker.tsx

@@ -848,7 +848,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
           defaultValue={
             mergedActivePickerIndex === 0 ? getValue(selectedValue, 1) : getValue(selectedValue, 0)
           }
-          defaultPickerValue={undefined}
+          // defaultPickerValue={undefined}
         />
       </RangeContext.Provider>
     );

tests/range.spec.tsx

@@ -31,7 +31,16 @@ describe('Picker.Range', () => {
 
       matchValues(wrapper, '1989-11-28', '1990-09-03');
     });
+    it('defaultPickerValue with showTime', () => {
+      const startDate = getMoment('1982-02-12');
+      const endDate = getMoment('1982-02-12');
 
+      const wrapper = mount(
+        <MomentRangePicker defaultPickerValue={[startDate, endDate]} showTime />,
+      );
+      wrapper.openPicker();
+      expect(wrapper.find('.rc-picker-year-btn').first().text()).toEqual(startDate.format('YYYY'));
+    });
     it('controlled', () => {
       const wrapper = mount(
         <MomentRangePicker value={[getMoment('1989-11-28'), getMoment('1990-09-03')]} />,