reuse parseDateString

remove update of officeuifebric
This commit is contained in:
Alice Rosa 2022-09-05 18:00:11 +03:00
parent 046feb1f98
commit 4cc204b64a
2 changed files with 17 additions and 19 deletions

View File

@ -25,7 +25,7 @@
"@types/webpack-env": "1.13.1",
"@uifabric/icons": "^7.3.14",
"moment": "^2.24.0",
"office-ui-fabric-react": "^7.197.1",
"office-ui-fabric-react": "^6.189.2",
"react-dnd": "~2.5.4",
"react-dnd-html5-backend": "~2.5.4",
"react-html-parser": "^2.0.2",

View File

@ -34,15 +34,14 @@ export default class DateFormField extends React.Component<IDateFormFieldProps,
public componentDidUpdate(prevProps: IDateFormFieldProps, prevState: IDateFormFieldState) {
//Component Value property got updated from List State
if (this.props.value && prevProps.value != this.props.value) {
let momentDate = this.props.fieldSchema.DisplayFormat == 1 ?
moment(this.props.value, moment.localeData(this.props.locale).longDateFormat('LT')) :
moment(this.props.value, moment.localeData(this.props.locale).longDateFormat('L'));
let date: Date = this._parseDateString(this.props.value);
this.setState({
hours: momentDate.hour(),
minutes: momentDate.minute(),
date: momentDate.toDate()
date: date,
hours: date.getHours(),
minutes: date.getMinutes()
});
}
//Component value updated
if (this.state.date && this.state.date != prevState.date) {
let result = this.props.fieldSchema.DisplayFormat == 1 ?
@ -96,26 +95,23 @@ export default class DateFormField extends React.Component<IDateFormFieldProps,
}
private _onSelectDate = (inputDate: Date | null | undefined): void => {
this.setState(prevState => {
let momentDate = inputDate ? this.props.fieldSchema.DisplayFormat == 1 ?
moment(inputDate, moment.localeData(this.props.locale).longDateFormat('LT')) :
let momentDate = inputDate ?
moment(inputDate, moment.localeData(this.props.locale).longDateFormat('L')) : moment();
momentDate.hour(prevState.hours);
momentDate.minute(prevState.minutes);
return {
date: momentDate.toDate(),
...prevState
hours: prevState.hours,
minutes: prevState.minutes
};
});
}
private _onHoursChanged = (event: React.FormEvent<IComboBox>, option?: IComboBoxOption): void => {
if (option) {
this.setState(prevState => {
let momentDate = prevState.date ? this.props.fieldSchema.DisplayFormat == 1 ?
moment(prevState.date, moment.localeData(this.props.locale).longDateFormat('LT')) :
let momentDate = prevState.date ?
moment(prevState.date, moment.localeData(this.props.locale).longDateFormat('L')) : moment();
let hours = parseInt(option.key.toString());
momentDate.hour(hours);
@ -131,8 +127,7 @@ export default class DateFormField extends React.Component<IDateFormFieldProps,
private _onMinutesChanged = (event: React.FormEvent<IComboBox>, option?: IComboBoxOption): void => {
if (option) {
this.setState(prevState => {
let momentDate = prevState.date ? this.props.fieldSchema.DisplayFormat == 1 ?
moment(prevState.date, moment.localeData(this.props.locale).longDateFormat('LT')) :
let momentDate = prevState.date ?
moment(prevState.date, moment.localeData(this.props.locale).longDateFormat('L')) : moment();
let minutes = parseInt(option.key.toString());
momentDate.hour(prevState.hours);
@ -151,9 +146,12 @@ export default class DateFormField extends React.Component<IDateFormFieldProps,
return null;
}
let momentDate = this.props.fieldSchema.DisplayFormat == 1 ?
moment(inputDate, moment.localeData(this.props.locale).longDateFormat('LT')) :
moment(inputDate, moment.localeData(this.props.locale).longDateFormat('L'));
let momentDate = moment(inputDate, moment.localeData(this.props.locale).longDateFormat('L'));
let time = this.props.fieldSchema.DisplayFormat == 1 ? moment(this.props.value.split(" ")[1], moment.localeData(this.props.locale).longDateFormat('LT')) : null;
if (time) {
momentDate.hours(time.hours());
momentDate.minutes(time.minutes());
}
return momentDate.toDate();
}