- fixed freezing form;

This commit is contained in:
Vitalii Kiiko
2026-04-13 12:30:28 +02:00
parent ba16a67776
commit dae8fea9f7
6 changed files with 51 additions and 25 deletions

View File

@@ -1,10 +1,30 @@
import React from 'react';
import React, { useMemo } from 'react';
import { classNames } from 'primereact/utils';
import { Controller } from 'react-hook-form';
import { is, isEmpty } from 'ramda';
import { Calendar } from 'primereact/calendar';
const DatepickerField = ({ field, fieldState, disabled, timeOnly, minDate, maxDate }) => {
const dateValue = useMemo(
() => is(String, field.value) && !isEmpty(field.value) ? new Date(field.value) : field.value,
[field.value]
);
return (
<Calendar id={field.name}
disabled={disabled}
value={dateValue}
onChange={(e) => field.onChange(e.value)}
dateFormat="dd/mm/yy"
hourFormat="24"
timeOnly={timeOnly}
showIcon
minDate={minDate}
maxDate={maxDate}
className={classNames({ 'p-invalid': fieldState.invalid })}/>
);
};
const Datepicker = ({
fieldName,
label,
@@ -28,17 +48,15 @@ const Datepicker = ({
control={control}
defaultValue={defaultValue}
rules={config}
render={({ field, fieldState }) => (<Calendar id={field.name}
disabled={disabled}
value={is(String, field.value) && !isEmpty(field.value) ? new Date(field.value) : field.value}
onChange={(e) => field.onChange(e.value)}
dateFormat="dd/mm/yy"
hourFormat="24"
timeOnly={timeOnly}
showIcon
minDate={minDate}
maxDate={maxDate}
className={classNames({ 'p-invalid': fieldState.invalid })}/>
render={({ field, fieldState }) => (
<DatepickerField
field={field}
fieldState={fieldState}
disabled={disabled}
timeOnly={timeOnly}
minDate={minDate}
maxDate={maxDate}
/>
)}/>
{infoText ? <small>{infoText}</small> : null}
</>)

View File

@@ -1,4 +1,4 @@
import React from 'react';
import React, { useMemo } from 'react';
import { classNames } from 'primereact/utils';
import { isNil } from 'ramda';
@@ -18,9 +18,12 @@ const DatepickerRange = ({
maxDate = null,
disabled = false
}) => {
const datesDefaultValue = !isNil(defaultValue) && defaultValue.length
? defaultValue.map(v => new Date(v))
: [];
const datesDefaultValue = useMemo(
() => !isNil(defaultValue) && defaultValue.length
? defaultValue.map(v => new Date(v))
: [],
[defaultValue]
);
return (
<>
<label htmlFor={fieldName} className={classNames({ 'p-error': errors[fieldName] })}>

View File

@@ -39,8 +39,8 @@ const NumberInput = ({
readOnly={readOnly}
value={is(Number, field.value) || (!is(Number, field.value) && !isNaN(parseFloat(field.value))) ? field.value : ''}
onValueChange={(e) => field.onChange(e.value)}
min={minAttr}
max={maxAttr}
min={readOnly ? undefined : minAttr}
max={readOnly ? undefined : maxAttr}
mode="decimal"
locale={locale}
showButtons

View File

@@ -106,6 +106,7 @@ const BandoApplication = () => {
const values = getValues();
const formValues = watch();
const onValidate = () => {
saveDraft('VALIDATE');
};

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useState } from 'react';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { __ } from '@wordpress/i18n';
import { classNames } from 'primereact/utils';
import { wrap } from 'object-path-immutable';
@@ -32,9 +32,11 @@ const DocumentsBeneficiary = () => {
const [newFileData, setNewFileData] = useState({});
const [fileAttached, setFileAttached] = useState([]);
const [reloadHash, setReloadHash] = useState(0);
const today = new Date();
const tomorrow = new Date(today);
tomorrow.setDate(today.getDate() + 1);
const tomorrow = useMemo(() => {
const d = new Date();
d.setDate(d.getDate() + 1);
return d;
}, []);
const company = head(companies.filter(o => o.id === chosenCompanyId));
const onCreateNew = useCallback((type) => {

View File

@@ -49,9 +49,11 @@ const EvaluationExtraFiles = ({
const [addDocLoading, setAddDocLoading] = useState(false);
const [reloadHash, setReloadHash] = useState(0);
const toast = useRef(null);
const today = new Date();
const tomorrow = new Date(today);
tomorrow.setDate(today.getDate() + 1);
const tomorrow = useMemo(() => {
const d = new Date();
d.setDate(d.getDate() + 1);
return d;
}, []);
const {
control,
handleSubmit,