From dae8fea9f7e24a3f2c883965e5d0c82f83289365 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 13 Apr 2026 12:30:28 +0200
Subject: [PATCH] - fixed freezing form;

---
 .../FormField/components/Datepicker/index.js  | 42 +++++++++++++------
 .../components/DatepickerRange/index.js       | 11 +++--
 .../FormField/components/NumberInput/index.js |  4 +-
 src/pages/BandoApplication/index.js           |  1 +
 src/pages/DocumentsBeneficiary/index.js       | 10 +++--
 .../components/EvaluationExtraFiles/index.js  |  8 ++--
 6 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/components/FormField/components/Datepicker/index.js b/src/components/FormField/components/Datepicker/index.js
index f4164c5..29ba317 100644
--- a/src/components/FormField/components/Datepicker/index.js
+++ b/src/components/FormField/components/Datepicker/index.js
@@ -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}
         </>)
diff --git a/src/components/FormField/components/DatepickerRange/index.js b/src/components/FormField/components/DatepickerRange/index.js
index 5c9fa75..aab496e 100644
--- a/src/components/FormField/components/DatepickerRange/index.js
+++ b/src/components/FormField/components/DatepickerRange/index.js
@@ -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] })}>
diff --git a/src/components/FormField/components/NumberInput/index.js b/src/components/FormField/components/NumberInput/index.js
index f11e5f4..685ecb6 100644
--- a/src/components/FormField/components/NumberInput/index.js
+++ b/src/components/FormField/components/NumberInput/index.js
@@ -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
diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index 96d5bb3..ab447e0 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -106,6 +106,7 @@ const BandoApplication = () => {
     const values = getValues();
     const formValues = watch();
 
+
     const onValidate = () => {
         saveDraft('VALIDATE');
     };
diff --git a/src/pages/DocumentsBeneficiary/index.js b/src/pages/DocumentsBeneficiary/index.js
index d7d3e48..33b6dac 100644
--- a/src/pages/DocumentsBeneficiary/index.js
+++ b/src/pages/DocumentsBeneficiary/index.js
@@ -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) => {
diff --git a/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js b/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js
index 444cc28..3131a48 100644
--- a/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js
@@ -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,