indicator-ui 0.0.133 → 0.0.135

package/dist/index.js

@@ -9263,26 +9263,26 @@ __webpack_require__.r(__webpack_exports__);
 
 
 function DateTimeField({ value, fieldConfig = 'datetime', onChange, dateFormat = 'dd.MM.yyyy', timeFormat = 'HH:mm', outFormat = 'iso-8601', additionStyle, datePlaceholder, timePlaceholder, timeZone = 'Z', ...props }) {
-    const getDateValue = () => {
+    const getValueInDate = () => {
         if (value === undefined)
             return undefined;
         let resFormat = outFormat === 'iso-8601' ? _consts__WEBPACK_IMPORTED_MODULE_4__.ISO_FORMAT : outFormat;
         return (0,_lib__WEBPACK_IMPORTED_MODULE_3__.saveParseDate)(value, { from: resFormat, fromTimeZone: timeZone });
     };
-    const initDate = () => {
+    const getDateFromValue = () => {
         if (fieldConfig === 'time' || value === undefined)
             return undefined;
-        const curDate = getDateValue();
+        const curDate = getValueInDate();
         return (0,_lib__WEBPACK_IMPORTED_MODULE_3__.saveFormatDate)(curDate, {
             to: dateFormat,
             errorNull: true,
             toTimeZone: timeZone,
         }) ?? undefined;
     };
-    const initTime = () => {
+    const getTimeFromValue = () => {
         if (fieldConfig === 'date' || value === undefined)
             return undefined;
-        const curDate = getDateValue();
+        const curDate = getValueInDate();
         return (0,_lib__WEBPACK_IMPORTED_MODULE_3__.saveFormatDate)(curDate, {
             to: timeFormat,
             errorNull: true,
@@ -9306,26 +9306,64 @@ function DateTimeField({ value, fieldConfig = 'datetime', onChange, dateFormat =
             res.setDate(dateTime.getDate());
         }
     };
-    const setDateValue = (newValue) => {
+    const getDateTimeFormatValue = (newValue) => {
+        if (newValue == null)
+            return null;
+        let dateFormat = '';
+        if (outFormat === 'iso-8601') {
+            dateFormat = _consts__WEBPACK_IMPORTED_MODULE_4__.ISO_FORMAT;
+        }
+        else {
+            dateFormat = outFormat;
+        }
+        const res = (0,_lib__WEBPACK_IMPORTED_MODULE_3__.saveFormatDate)(newValue, {
+            to: dateFormat,
+            toTimeZone: timeZone,
+        });
+        if (typeof res === 'string') {
+            return res;
+        }
+        return null;
+    };
+    const getDateTimeValue = () => {
+        let resDate = new Date();
+        switch (fieldConfig) {
+            case 'datetime':
+                if (time && date) {
+                    setDateInDate(resDate, date);
+                    setTimeInDate(resDate, time);
+                }
+                break;
+            case 'date':
+                if (date) {
+                    setDateInDate(resDate, date);
+                }
+                break;
+            case 'time':
+                if (time) {
+                    setTimeInDate(resDate, time);
+                }
+                break;
+        }
+        return resDate;
+    };
+    const changeValue = (newValue) => {
         if (onChange && newValue) {
-            let dateFormat = '';
-            if (outFormat === 'iso-8601') {
-                dateFormat = _consts__WEBPACK_IMPORTED_MODULE_4__.ISO_FORMAT;
-            }
-            else {
-                dateFormat = outFormat;
-            }
-            const res = (0,_lib__WEBPACK_IMPORTED_MODULE_3__.saveFormatDate)(newValue, {
-                to: dateFormat,
-                toTimeZone: timeZone,
-            });
-            if (res != null && typeof res === 'string') {
-                onChange(res);
+            const formatValue = getDateTimeFormatValue(newValue);
+            if (formatValue != null) {
+                onChange(formatValue);
             }
         }
     };
-    const [time, setTime] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(initTime());
-    const [date, setDate] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(initDate());
+    const [time, setTime] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(getTimeFromValue());
+    const [date, setDate] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(getDateFromValue());
+    (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
+        const curValue = getDateTimeFormatValue(getDateTimeValue());
+        if (value !== curValue) {
+            setTime(getTimeFromValue());
+            setDate(getDateFromValue());
+        }
+    }, [value]);
     (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
         if (
         // Проверка пустого значения
@@ -9335,26 +9373,8 @@ function DateTimeField({ value, fieldConfig = 'datetime', onChange, dateFormat =
             onChange('');
         }
         else if (time || date) {
-            let resDate = new Date();
-            switch (fieldConfig) {
-                case 'datetime':
-                    if (time && date) {
-                        setDateInDate(resDate, date);
-                        setTimeInDate(resDate, time);
-                    }
-                    break;
-                case 'date':
-                    if (date) {
-                        setDateInDate(resDate, date);
-                    }
-                    break;
-                case 'time':
-                    if (time) {
-                        setTimeInDate(resDate, time);
-                    }
-                    break;
-            }
-            setDateValue(resDate);
+            const resDate = getDateTimeValue();
+            changeValue(resDate);
         }
     }, [time, date]);
     const getTimeContent = () => {
@@ -10570,9 +10590,9 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function SelectFieldOptionsItem({ option, active, onClick, className }) {
+function SelectFieldOptionsItem({ option, active, onClick }) {
     if (option.component) {
-        return react__WEBPACK_IMPORTED_MODULE_1___default().cloneElement(option.component, { onClick: onClick, active: active });
+        return react__WEBPACK_IMPORTED_MODULE_1___default().cloneElement(option.component, { onClick: onClick, active: active, ...option.component.props });
     }
     return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("button", { onClick: onClick, className: (0,clsx__WEBPACK_IMPORTED_MODULE_2__["default"])(_styles__WEBPACK_IMPORTED_MODULE_4__.SelectFieldStyle.selectFieldOptionsItem, {
             [_styles__WEBPACK_IMPORTED_MODULE_4__.SelectFieldStyle.active]: active,