Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actively set state to set the input value #8655

Merged
merged 1 commit into from
Feb 16, 2022
Merged

Actively set state to set the input value #8655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions frontend/src/lib/components/PropertyFilters/components/PropertyFilterDatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,24 @@ export function PropertyFilterDatePicker({
const valueIsYYYYMMDD = narrowToString(value) && value?.length === 10

const [datePickerOpen, setDatePickerOpen] = useState(operator && isOperatorDate(operator) && autoFocus)
const [datePickerStartingValue] = useState(dayJSMightParse(value) ? dayjs(value) : undefined)
const [datePickerValue, setDatePickerValue] = useState(dayJSMightParse(value) ? dayjs(value) : undefined)
const [includeTimeInFilter, setIncludeTimeInFilter] = useState(!!value && !valueIsYYYYMMDD)
const [dateFormat, setDateFormat] = useState(valueIsYYYYMMDD ? onlyDateFormat : dateAndTimeFormat)

useEffect(() => {
setDateFormat(includeTimeInFilter ? dateAndTimeFormat : onlyDateFormat)
}, [includeTimeInFilter])

const onQuickChoice = (selectedRelativeRange: unknown): void => {
const matchedMapping = dateMapping[String(selectedRelativeRange)]
const formattedForDateFilter =
matchedMapping?.getFormattedDate && matchedMapping?.getFormattedDate(now(), dateFormat)
// returns `${earliest date} - ${latest date}
const fromDate = formattedForDateFilter?.split(' - ')[0]
setDatePickerValue(dayjs(fromDate))
setValue(fromDate)
}

return (
<DatePicker
style={style}
Expand All @@ -61,10 +71,11 @@ export function PropertyFilterDatePicker({
showTime={includeTimeInFilter}
showNow={false}
showToday={false}
defaultValue={datePickerStartingValue}
value={datePickerValue}
onFocus={() => setDatePickerOpen(true)}
onBlur={() => setDatePickerOpen(false)}
onOk={(selectedDate) => {
setDatePickerValue(selectedDate)
setValue(selectedDate.format(dateFormat))
setDatePickerOpen(false)
}}
Expand All @@ -75,6 +86,7 @@ export function PropertyFilterDatePicker({
if (includeTimeInFilter) {
return // we wait for a click on OK
}
setDatePickerValue(selectedDate)
setValue(selectedDate.format(dateFormat))
setDatePickerOpen(false)
}}
Expand All @@ -95,12 +107,7 @@ export function PropertyFilterDatePicker({
<Select
bordered={true}
style={{ width: '100%', paddingBottom: '1rem' }}
onSelect={(selectedRelativeRange) => {
const matchedMapping = dateMapping[String(selectedRelativeRange)]
const formattedForDateFilter =
matchedMapping?.getFormattedDate && matchedMapping?.getFormattedDate(now(), dateFormat)
setValue(formattedForDateFilter?.split(' - ')[0])
}}
onSelect={onQuickChoice}
placeholder={'e.g. 7 days ago'}
>
{[
Expand Down