Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/components/Search/FilterDropdowns/DateSelectPopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ function DateSelectPopup({label, value, presets, closeOverlay, onChange}: DateSe
const styles = useThemeStyles();
const searchDatePresetFilterBaseRef = useRef<SearchDatePresetFilterBaseHandle>(null);
const [selectedDateModifier, setSelectedDateModifier] = useState<SearchDateModifier | null>(null);
const shouldShowHorizontalRule = !!presets?.length;

const applyChanges = useCallback(() => {
if (!searchDatePresetFilterBaseRef.current) {
Expand Down Expand Up @@ -93,7 +92,6 @@ function DateSelectPopup({label, value, presets, closeOverlay, onChange}: DateSe
selectedDateModifier={selectedDateModifier}
onSelectDateModifier={setSelectedDateModifier}
presets={presets}
shouldShowHorizontalRule={shouldShowHorizontalRule}
/>
</View>
<View style={[styles.flexRow, styles.gap2, styles.ph5]}>
Expand Down
7 changes: 3 additions & 4 deletions src/components/Search/SearchDatePresetFilterBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<SearchDatePresetFilterBaseHandle>;
};
Expand All @@ -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<SearchDateValues>(defaultDateValues);
const setDateValue = useCallback((dateModifier: SearchDateModifier, value: string | undefined) => {
setDateValues((prevDateValues) => {
Expand Down