From 66d2db8ebd6331276690eb526bfc08d25c8937f1 Mon Sep 17 00:00:00 2001 From: lorretheboy Date: Sat, 6 Sep 2025 17:47:51 +0800 Subject: [PATCH] fix: missign divider between date filter --- src/components/Search/FilterDropdowns/DateSelectPopup.tsx | 2 -- src/components/Search/SearchDatePresetFilterBase.tsx | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/Search/FilterDropdowns/DateSelectPopup.tsx b/src/components/Search/FilterDropdowns/DateSelectPopup.tsx index a151dc6a8828..2c8d8b9d1195 100644 --- a/src/components/Search/FilterDropdowns/DateSelectPopup.tsx +++ b/src/components/Search/FilterDropdowns/DateSelectPopup.tsx @@ -37,7 +37,6 @@ function DateSelectPopup({label, value, presets, closeOverlay, onChange}: DateSe const styles = useThemeStyles(); const searchDatePresetFilterBaseRef = useRef(null); const [selectedDateModifier, setSelectedDateModifier] = useState(null); - const shouldShowHorizontalRule = !!presets?.length; const applyChanges = useCallback(() => { if (!searchDatePresetFilterBaseRef.current) { @@ -93,7 +92,6 @@ function DateSelectPopup({label, value, presets, closeOverlay, onChange}: DateSe selectedDateModifier={selectedDateModifier} onSelectDateModifier={setSelectedDateModifier} presets={presets} - shouldShowHorizontalRule={shouldShowHorizontalRule} /> diff --git a/src/components/Search/SearchDatePresetFilterBase.tsx b/src/components/Search/SearchDatePresetFilterBase.tsx index e03234b13716..716dfcd01c13 100644 --- a/src/components/Search/SearchDatePresetFilterBase.tsx +++ b/src/components/Search/SearchDatePresetFilterBase.tsx @@ -42,9 +42,6 @@ type SearchDatePresetFilterBaseProps = { /** The date presets */ presets?: SearchDatePreset[]; - /** Whether we should display the horizontal rule after the presets list */ - shouldShowHorizontalRule?: boolean; - /** The ref handle */ ref: Ref; }; @@ -59,12 +56,14 @@ type SearchDatePresetFilterBaseProps = { * - On save: if a date modifier is selected (i.e. user clicked save at the calendar picker) you should `setDateValueOfSelectedDateModifier` otherwise `getDateValues` * - On reset: if a date modifier is selected (i.e. user clicked reset at the calendar picker) you should `clearDateValueOfSelectedDateModifier` otherwise `clearDateValues` */ -function SearchDatePresetFilterBase({defaultDateValues, selectedDateModifier, onSelectDateModifier, presets, shouldShowHorizontalRule = false, ref}: SearchDatePresetFilterBaseProps) { +function SearchDatePresetFilterBase({defaultDateValues, selectedDateModifier, onSelectDateModifier, presets, ref}: SearchDatePresetFilterBaseProps) { const theme = useTheme(); const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); + const shouldShowHorizontalRule = !!presets?.length; + const [dateValues, setDateValues] = useState(defaultDateValues); const setDateValue = useCallback((dateModifier: SearchDateModifier, value: string | undefined) => { setDateValues((prevDateValues) => {