fix:add hasActiveSubmitValue check for submitIndexRef

Author: Zyf665

src/PickerInput/RangePicker.tsx

@@ -260,7 +260,8 @@ function RangePicker<DateType extends object = any>(
     setActiveIndex,
     nextActiveIndex,
     activeIndexList,
-    submitIndexRef,
+    updateSubmitIndex,
+    hasActiveSubmitValue,
   ] = useRangeActive(disabled, allowEmpty, mergedOpen);
 
   const onSharedFocus = (event: React.FocusEvent<HTMLElement>, index?: number) => {
@@ -326,8 +327,6 @@ function RangePicker<DateType extends object = any>(
     flushSubmit,
     /** Trigger `onChange` directly without check `disabledDate` */
     triggerSubmitChange,
-    /** Tell `index` has filled value in it */
-    hasSubmitValue,
   ] = useRangeValue<RangeValueType<DateType>, DateType>(
     filledProps,
     mergedValue,
@@ -414,7 +413,7 @@ function RangePicker<DateType extends object = any>(
     if (date) {
       nextValue = fillCalendarValue(date, activeIndex);
     }
-    submitIndexRef.current = activeIndex;
+    updateSubmitIndex(activeIndex);
     // Get next focus index
     const nextIndex = nextActiveIndex(nextValue);
 
@@ -642,7 +641,7 @@ function RangePicker<DateType extends object = any>(
       needConfirm &&
       // Not change index if is not filled
       !allowEmpty[lastActiveIndex] &&
-      !hasSubmitValue(lastActiveIndex, submitIndexRef.current) &&
+      !hasActiveSubmitValue(lastActiveIndex) &&
       calendarValue[lastActiveIndex]
     ) {
       selectorRef.current.focus({ index: lastActiveIndex });

src/PickerInput/hooks/useRangeActive.ts

@@ -23,17 +23,24 @@ export default function useRangeActive<DateType>(
   setActiveIndex: (index: number) => void,
   nextActiveIndex: NextActive<DateType>,
   activeList: number[],
-  submitIndexRef: React.MutableRefObject<number | null>,
+  updateSubmitIndex: (index: number | null) => void,
+  hasActiveSubmitValue: (index: number) => boolean,
 ] {
   const [activeIndex, setActiveIndex] = React.useState(0);
   const [focused, setFocused] = React.useState<boolean>(false);
 
   const activeListRef = React.useRef<number[]>([]);
-
   const submitIndexRef = React.useRef<number | null>(null);
-
   const lastOperationRef = React.useRef<OperationType>(null);
 
+  const updateSubmitIndex = (index: number | null) => {
+    submitIndexRef.current = index;
+  };
+
+  const hasActiveSubmitValue = (index: number) => {
+    return submitIndexRef.current === index;
+  };
+
   const triggerFocus = (nextFocus: boolean) => {
     setFocused(nextFocus);
   };
@@ -65,7 +72,7 @@ export default function useRangeActive<DateType>(
   useLockEffect(focused || mergedOpen, () => {
     if (!focused) {
       activeListRef.current = [];
-      submitIndexRef.current = null;
+      updateSubmitIndex(null);
     }
   });
 
@@ -83,6 +90,7 @@ export default function useRangeActive<DateType>(
     setActiveIndex,
     nextActiveIndex,
     activeListRef.current,
-    submitIndexRef,
+    updateSubmitIndex,
+    hasActiveSubmitValue,
   ];
 }

src/PickerInput/hooks/useRangeValue.ts

@@ -186,7 +186,7 @@ export default function useRangeValue<ValueType extends DateType[], DateType ext
   /** Trigger `onChange` directly without check `disabledDate` */
   triggerSubmitChange: (value: ValueType) => boolean,
   /** Tell `index` has filled value in it */
-  hasSubmitValue: (index: number, submitIndex: number | null) => boolean,
+  hasSubmitValue: (index: number) => boolean,
 ] {
   const {
     // MISC
@@ -333,8 +333,8 @@ export default function useRangeValue<ValueType extends DateType[], DateType ext
   );
 
   // ============================ Check =============================
-  function hasSubmitValue(index: number, submitIndex: number | null) {
-    return submitIndex === index;
+  function hasSubmitValue(index: number) {
+    return !!submitValue()[index];
   }
 
   // ============================ Return ============================