Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ const ItineraryModalFormHeader = ({
dispatch(updateName(e.target.value));
};
// Timetable item name error
const [nameFocused, setNameFocused] = useState(false);
const [isNameBlurred, setIsNameBlurred] = useState(false);

const nameError: StatusWithMessage | undefined = useMemo(() => {
const shouldShowError = (nameFocused || submitAttempted) && isNameEmpty;
const shouldShowError = (isNameBlurred || (submitAttempted && isNameBlurred)) && isNameEmpty;
if (!shouldShowError) return undefined;

return {
status: 'error',
message: t('errorMessages.requiredField'),
};
}, [nameFocused, submitAttempted, isNameEmpty, t]);
}, [isNameBlurred, submitAttempted, isNameEmpty, t]);

// Category warning
const categoryWarningMessage = useMemo(() => {
Expand Down Expand Up @@ -190,7 +190,12 @@ const ItineraryModalFormHeader = ({
value={name}
title={name}
onChange={handleNameChange}
onBlur={() => setNameFocused(true)}
onBlur={() => {
setIsNameBlurred(true);
}}
onFocus={() => {
setIsNameBlurred(false);
}}
statusWithMessage={nameError}
/>
</div>
Expand Down
Loading