Merge branch 'fix/date_picker_hover_2' into develop

illacloud · Feb 18, 2024 · 97a9bce · 97a9bce
2 parents 06c3957 + cc1f0f4
commit 97a9bce
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/packages/date-picker/src/range-date-picker.tsx b/packages/date-picker/src/range-date-picker.tsx
@@ -721,6 +721,12 @@ export const RangeDatePicker = forwardRef<HTMLDivElement, RangeDatePickerProps>(
       (showTime && panelModes[0] === "date" && panelModes[1] === "date") ||
       extra
 
+    useEffect(() => {
+      if (!mergedPopupVisible) {
+        setHoverPlaceholderValue(undefined)
+      }
+    }, [mergedPopupVisible])
+
     return (
       <PickerContext.Provider value={{ utcOffset, timezone, weekStart }}>
         <Trigger

diff --git a/packages/date-picker/src/signle-date-picker.tsx b/packages/date-picker/src/signle-date-picker.tsx
@@ -396,6 +396,12 @@ export const SingleDatePicker = forwardRef<
     extra ||
     (!showTime && panelMode === "date" && showNowBtn)
 
+  useEffect(() => {
+    if (!mergedPopupVisible) {
+      setHoverPlaceholderValue(undefined)
+    }
+  }, [mergedPopupVisible])
+
   return (
     <PickerContext.Provider value={{ utcOffset, timezone, weekStart }}>
       <Trigger

diff --git a/packages/date-picker/src/signle-year-picker.tsx b/packages/date-picker/src/signle-year-picker.tsx
@@ -270,6 +270,12 @@ export const SingleYearPicker = forwardRef<
   const suffixIcon =
     inputSuffix === null ? null : inputSuffix || <CalendarIcon />
 
+  useEffect(() => {
+    if (!mergedPopupVisible) {
+      setHoverPlaceholderValue(undefined)
+    }
+  }, [mergedPopupVisible])
+
   return (
     <PickerContext.Provider value={{ utcOffset, timezone, weekStart }}>
       <Trigger

diff --git a/packages/date-picker/src/single-month-picker.tsx b/packages/date-picker/src/single-month-picker.tsx
@@ -308,6 +308,12 @@ export const SingleMonthPicker = forwardRef<
   const suffixIcon =
     inputSuffix === null ? null : inputSuffix || <CalendarIcon />
 
+  useEffect(() => {
+    if (!mergedPopupVisible) {
+      setHoverPlaceholderValue(undefined)
+    }
+  }, [mergedPopupVisible])
+
   return (
     <PickerContext.Provider value={{ utcOffset, timezone, weekStart }}>
       <Trigger

diff --git a/packages/date-picker/src/single-quarter-picker.tsx b/packages/date-picker/src/single-quarter-picker.tsx
@@ -308,6 +308,12 @@ export const SingleQuarterPicker = forwardRef<
   const suffixIcon =
     inputSuffix === null ? null : inputSuffix || <CalendarIcon />
 
+  useEffect(() => {
+    if (!mergedPopupVisible) {
+      setHoverPlaceholderValue(undefined)
+    }
+  }, [mergedPopupVisible])
+
   return (
     <PickerContext.Provider value={{ utcOffset, timezone, weekStart }}>
       <Trigger