admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/2022-02-14' into release/2022-02-18

Browse Source
This commit is contained in:
Patrick Fic
2022-02-14 19:33:13 -08:00
parent 22e6d596e6 e79b9f9084
commit 680dd98f6d
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/form-date-picker/form-date-picker.component.jsx
View File

@@ -23,20 +23,21 @@ export function FormDatePicker({
onChange, onChange,
onBlur, onBlur,
onlyFuture, onlyFuture,
isDateOnly = true,
...restProps ...restProps
}) { }) {
const ref = useRef(); const ref = useRef();
const handleChange = (newDate) => { const handleChange = (newDate) => {
if (value !== newDate && onChange) { if (value !== newDate && onChange) {
onChange(newDate); onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
} }
}; };
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.key.toLowerCase() === "t") { if (e.key.toLowerCase() === "t") {
if (onChange) { if (onChange) {
onChange(moment()); onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
// if (ref.current && ref.current.blur) ref.current.blur(); // if (ref.current && ref.current.blur) ref.current.blur();
} }
} else if (e.key.toLowerCase() === "enter") { } else if (e.key.toLowerCase() === "enter") {
@@ -64,7 +65,8 @@ export function FormDatePicker({
}); });
} }
if (_a.isValid() && onChange) onChange(_a); if (_a.isValid() && onChange)
onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
}; };
return ( return (

15
client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
View File

@@ -19,13 +19,14 @@ const DateTimePicker = (
return ( return (
<div id={id}> <div id={id}>
<FormDatePicker <FormDatePicker
{...(onlyFuture && { {...restProps}
disabledDate: (d) => moment().subtract(1, "day").isAfter(d), {...(onlyFuture && {
})} disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
value={value} })}
onBlur={onBlur} value={value}
onChange={onChange} onBlur={onBlur}
{...restProps} onChange={onChange}
isDateOnly={false}
/> />
<TimePicker <TimePicker