chore: optimize logic of viewDate

react-component · Feb 25, 2021 · 29216be · 29216be
1 parent 5dd3d6d
commit 29216be
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/examples/basic.tsx b/examples/basic.tsx
@@ -58,7 +58,6 @@ export default () => {
           <h3>Datetime</h3>
           <Picker<Moment>
             {...sharedProps}
-            value={undefined}
             locale={zhCN}
             defaultPickerValue={defaultValue.clone().subtract(1, 'month')}
             showTime={{

diff --git a/src/PickerPanel.tsx b/src/PickerPanel.tsx
@@ -37,7 +37,7 @@ import type { MonthCellRender } from './panels/MonthPanel/MonthBody';
 import RangeContext from './RangeContext';
 import getExtraFooter from './utils/getExtraFooter';
 import getRanges from './utils/getRanges';
-import { getLowerBoundTime, setTime } from './utils/timeUtil';
+import { getLowerBoundTime, setDateTime, setTime } from './utils/timeUtil';
 
 export type PickerPanelSharedProps<DateType> = {
   prefixCls?: string;
@@ -202,7 +202,21 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
   const [viewDate, setInnerViewDate] = useMergedState<DateType | null, DateType>(null, {
     value: pickerValue,
     defaultValue: defaultPickerValue || mergedValue,
-    postState: (date) => date || generateConfig.getNow(),
+    postState: (date) => {
+      const now = generateConfig.getNow();
+      if (!date) return now;
+      // When value is null and set showTime
+      if (!mergedValue && showTime) {
+        if (typeof showTime === 'object') {
+          return setDateTime(generateConfig, date, showTime.defaultValue || now);
+        }
+        if (defaultValue) {
+          return setDateTime(generateConfig, date, defaultValue);
+        }
+        return setDateTime(generateConfig, date, now);
+      }
+      return date;
+    },
   });
 
   const setViewDate = (date: DateType) => {

diff --git a/src/hooks/useHoverValue.ts b/src/hooks/useHoverValue.ts
@@ -1,5 +1,4 @@
 import { useState, useEffect, useRef } from 'react';
-import { setDateTime } from '../utils/timeUtil';
 import type { ValueTextConfig } from './useValueTexts';
 import useValueTexts from './useValueTexts';
 
@@ -28,11 +27,7 @@ export default function useHoverValue<DateType>(
   });
 
   function onEnter(date: DateType) {
-    let hoverDate = date;
-    if (!valueText) {
-      hoverDate = setDateTime(generateConfig, date, generateConfig.getNow())
-    }
-    setValue(hoverDate);
+    setValue(date);
   }
 
   function onLeave(immediately: boolean = false) {