Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Properly call onChange in DatePickerInput #2448

Merged
merged 19 commits into from
Nov 21, 2022
Merged

Properly call onChange in DatePickerInput #2448

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
044f7e0
allow selectedDate to be controlled by prop
qubis741 Nov 16, 2022
ab3aba0
moved useEffect to top of component so its more visible
qubis741 Nov 16, 2022
2ae4d3a
give external error higher priority than internal
qubis741 Nov 16, 2022
30cb112
return string in onChange, if invalid date
qubis741 Nov 16, 2022
b50ae46
adapt tests to new type definition of onChange
qubis741 Nov 16, 2022
72c371f
call onChange on closing of popover, so proper argument is passed
qubis741 Nov 16, 2022
7736dff
changed others.selectedDate to preselectedDate for easier readability
qubis741 Nov 18, 2022
b9770ba
added isValidDate util
qubis741 Nov 18, 2022
aaa81ad
improved DatePickerInput useEffect to properly assign preselectedDate…
qubis741 Nov 18, 2022
70f176f
added conditional typed argument to DatePickerInput onChange
qubis741 Nov 18, 2022
74f3a60
properly set date if preselectedDate is invalid
qubis741 Nov 18, 2022
3f8d079
added isValid locale util
qubis741 Nov 18, 2022
1ba7615
allow string type in selectedDate prop to match reality and adapt cod…
qubis741 Nov 18, 2022
d4847f9
added comment to explain ts-ignore
qubis741 Nov 18, 2022
935b822
Merge branch 'next-release' into FRAF-1154-v4
qubis741 Nov 18, 2022
cb37d27
bump version
qubis741 Nov 18, 2022
3525dc7
improve detecting focus trap exception in DatePicker
qubis741 Nov 18, 2022
390151a
added missing dependency to useCallback
qubis741 Nov 21, 2022
e8b97f3
improved comment
qubis741 Nov 21, 2022
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
16 changes: 12 additions & 4 deletions src/components/datepicker/DatePickerInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Input from '../input';
import { InputProps } from '../input/Input';
import Popover from '../popover';
import { PopoverProps } from '../popover/Popover';
import { formatDate, parseMultiFormatsDate } from './localeUtils';
import { formatDate, isValidDate, parseMultiFormatsDate } from './localeUtils';
import theme from './theme.css';
import { isAllowedDate } from './utils';

Expand Down Expand Up @@ -138,9 +138,17 @@ function DatePickerInput<IsTypeable extends boolean = true>({
[inputValue],
);
useEffect(() => {
setSelectedDate(others.selectedDate);
handleInputValueChange(others.selectedDate ? getFormattedDateString(others.selectedDate) : '');
}, [others.selectedDate]);
if (!preselectedDate) {
handleInputValueChange('');
setSelectedDate(preselectedDate);
// If preseleced invalid date happens when typed date is invalid and value is passed from form in codebase
qubis741 marked this conversation as resolved.
Show resolved Hide resolved
} else if (isValidDate(preselectedDate)) {
handleInputValueChange(getFormattedDateString(preselectedDate));
setSelectedDate(preselectedDate);
} else {
setSelectedDate(undefined);
}
}, [preselectedDate]);

const handleInputFocus = (event: React.FocusEvent<HTMLElement>) => {
if (inputProps?.readOnly) {
Expand Down