chore: Adjust ranged value display logic

Author: zombieJ

src/RangePicker.tsx

@@ -171,31 +171,19 @@ function InternalRangePicker<DateType>(
 
   // Select value: used for click to update ranged value. Must set in pair
   const [selectedValues, setSelectedValues] = React.useState<
-    [DateType, DateType] | undefined
+    [DateType | null, DateType | null] | undefined
   >(undefined);
 
   React.useEffect(() => {
-    if (value1 && value2) {
-      setSelectedValues([value1, value2]);
-    } else {
-      setSelectedValues(undefined);
-    }
+    setSelectedValues([value1, value2]);
   }, [value1, value2]);
 
   const onStartSelect = (date: DateType) => {
-    if (value2) {
-      setSelectedValues([date, value2]);
-    } else {
-      setSelectedValues(undefined);
-    }
+    setSelectedValues([date, value2]);
   };
 
   const onEndSelect = (date: DateType) => {
-    if (value1) {
-      setSelectedValues([value1, date]);
-    } else {
-      setSelectedValues(undefined);
-    }
+    setSelectedValues([value1, date]);
   };
 
   // ============================= Change =============================

src/panels/DatePanel/DateBody.tsx

@@ -8,7 +8,7 @@ import {
   isSameMonth,
   isInRange,
 } from '../../utils/dateUtil';
-import { Locale, NullableDateType } from '../../interface';
+import { Locale } from '../../interface';
 import RangeContext from '../../RangeContext';
 
 export type DateRender<DateType> = (
@@ -32,7 +32,6 @@ export interface DateBodyProps<DateType> extends DateBodyPassProps<DateType> {
   viewDate: DateType;
   locale: Locale;
   rowCount: number;
-  rangedValue?: [NullableDateType<DateType>, NullableDateType<DateType>];
   onSelect: (value: DateType) => void;
 }
 

src/utils/dateUtil.ts

@@ -92,6 +92,7 @@ export function isEqual<DateType>(
   );
 }
 
+/** Between in date but not equal of date */
 export function isInRange<DateType>(
   generateConfig: GenerateConfig<DateType>,
   startDate: DateType,
@@ -103,6 +104,8 @@ export function isInRange<DateType>(
   }
 
   return (
+    !isSameDate(generateConfig, startDate, current) &&
+    !isSameDate(generateConfig, endDate, current) &&
     generateConfig.isAfter(current, startDate) &&
     generateConfig.isAfter(endDate, current)
   );