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

Jump to bottom

Fix/date picker value entering #6478

Merged
merged 11 commits into from
Apr 29, 2024
Merged

Fix/date picker value entering #6478

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d1e520
allow input keep not fully formated date
KirilCycle Apr 26, 2024
dc10285
feat: apply standart format on blur
KirilCycle Apr 26, 2024
d0fb66f
fix: remove logs
KirilCycle Apr 26, 2024
71e7d64
fix: format code
KirilCycle Apr 26, 2024
b3528bc
fix: timeOnly time validation
KirilCycle Apr 26, 2024
1cbec5b
fix: remove extra code
KirilCycle Apr 27, 2024
f5cd7dc
code format
KirilCycle Apr 27, 2024
4d3a9f3
fix: use 'typeUpdate' to properly control input value
KirilCycle Apr 27, 2024
1d0b140
fix: remove extra code
KirilCycle Apr 27, 2024
117f69f
fix: change ref name
KirilCycle Apr 27, 2024
90b50cf
fix: put false value to ref
KirilCycle Apr 27, 2024
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
12 changes: 9 additions & 3 deletions components/lib/calendar/Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const Calendar = React.memo(
const [overlayVisibleState, setOverlayVisibleState] = React.useState(false);
const [viewDateState, setViewDateState] = React.useState(null);
const [idState, setIdState] = React.useState(props.id);
const isTypingRef = React.useRef(false);

const metaData = {
props,
Expand Down Expand Up @@ -96,7 +97,7 @@ export const Calendar = React.memo(
};

const onInputBlur = (event) => {
!props.keepInvalid && updateInputfield(props.value);
updateInputfield(props.value);
props.onBlur && props.onBlur(event);
setFocusedState(false);
};
Expand Down Expand Up @@ -144,9 +145,10 @@ export const Calendar = React.memo(

const updateValueOnInput = (event, rawValue, invalidCallback) => {
try {
const value = parseValueFromString(rawValue);
const value = parseValueFromString(props.timeOnly ? rawValue.replace('_', '') : rawValue);

if (isValidSelection(value)) {
isTypingRef.current = true;
updateModel(event, value);
updateViewDate(event, value.length ? value[0] : value);
}
Expand Down Expand Up @@ -3019,7 +3021,11 @@ export const Calendar = React.memo(
const newDate = props.value;

if (previousValue !== newDate) {
updateInputfield(newDate);
if (!isTypingRef.current) {
updateInputfield(newDate);
}

isTypingRef.current = false;

// #3516 view date not updated when value set programatically
if (!visible && newDate) {
Expand Down
Loading