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

Fixed issues with React-Datepicker. Used only antd components instead. BOD-246

Browse Source
This commit is contained in:
Patrick Fic
2020-08-04 16:13:33 -07:00
parent bdba1a2132
commit e8e7e76473
4 changed files with 25 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ const FormDatePicker = ({ value, onChange, onBlur, ...restProps }, ref) => {
return (
<div onKeyDown={handleKeyDown}>
<DatePicker
value={value}
value={value ? moment(value) : null}
onChange={handleChange}
format={dateFormat}
{...restProps}

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

@@ -1,32 +1,30 @@
import React, { forwardRef } from "react";
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import { useTranslation } from "react-i18next";
//import DatePicker from "react-datepicker";
//import "react-datepicker/src/stylesheets/datepicker.scss";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
import { TimePicker } from "antd";
import moment from "moment";
//To be used as a form element only.
const DateTimePicker = ({ value, onChange, onBlur }, ref) => {
const { t } = useTranslation();
const handleChange = (newDate) => {
if (value !== newDate && onChange) {
onChange(newDate);
}
};
// const handleChange = (newDate) => {
// if (value !== newDate && onChange) {
// onChange(newDate);
// }
// };
return (
<DatePicker
className="ant-picker ant-picker-input"
data-lpignore="true"
selected={value ? new Date(value) : null}
onChange={handleChange}
showTimeSelect
timeIntervals={15}
onBlur={onBlur}
isClearable
placeholderText={t("general.labels.selectdate")}
dateFormat="MMMM d, yyyy h:mm aa"
/>
<div>
<FormDatePicker value={value} onChange={onChange} />
<TimePicker
value={value ? moment(value) : null}
onChange={onChange}
showSecond={false}
minuteStep={15}
format="hh:mm a"
/>
</div>
);
};