indicator-ui 0.0.140 → 0.0.142

package/dist/index.js

@@ -6946,7 +6946,7 @@ function saveFormatDate(date, { from, to, errorNull = false, locale, toTimeZone,
     try {
         let parsedDate;
         if (typeof date === "string") {
-            if (from) {
+            if (from && from !== 'iso-8601') {
                 parsedDate = (0,date_fns__WEBPACK_IMPORTED_MODULE_1__.parse)(date, from, new Date());
             }
             else {
@@ -6964,6 +6964,9 @@ function saveFormatDate(date, { from, to, errorNull = false, locale, toTimeZone,
         if (toTimeZone) {
             parsedDate = (0,date_fns_tz__WEBPACK_IMPORTED_MODULE_0__.toZonedTime)(parsedDate, toTimeZone);
         }
+        if (to === 'iso-8601') {
+            return parsedDate.toISOString();
+        }
         return (0,date_fns_tz__WEBPACK_IMPORTED_MODULE_0__.format)(parsedDate, to, { locale: locale, timeZone: toTimeZone });
     }
     catch (e) {
@@ -6992,7 +6995,13 @@ __webpack_require__.r(__webpack_exports__);
 
 function saveParseDate(date, { from, locale, fromTimeZone }) {
     try {
-        let parsedDate = (0,date_fns__WEBPACK_IMPORTED_MODULE_1__.parse)(date, from, new Date(), { locale: locale });
+        let parsedDate;
+        if (from === 'iso-8601') {
+            parsedDate = new Date(date);
+        }
+        else {
+            parsedDate = (0,date_fns__WEBPACK_IMPORTED_MODULE_1__.parse)(date, from, new Date(), { locale: locale });
+        }
         // Применяем fromTimeZone, если указан
         if (fromTimeZone) {
             parsedDate = (0,date_fns_tz__WEBPACK_IMPORTED_MODULE_0__.fromZonedTime)(parsedDate, fromTimeZone);
@@ -8816,10 +8825,10 @@ const inputFieldComponent = (schema, key, additionProps) => {
         const initFields = additionProps.getPrivateRefStoreValue(_ui__WEBPACK_IMPORTED_MODULE_3__.INIT_FIELDS_NAME) || [];
         if (!initFields.find(item => JSON.stringify(item) === JSON.stringify(keyWay))) {
             const curKeyWayStore = additionProps.getPrivateRefStoreValue(_ui__WEBPACK_IMPORTED_MODULE_3__.KEY_WAY_STORE_NAME) ?? [];
-            // Безопасно берем keyWay, так как он может быть массивом
-            const saveKeyWay = typeof keyWay === 'string' ? [keyWay] : keyWay;
-            additionProps.addPrivateRefStoreValue([...curKeyWayStore, ...saveKeyWay], _ui__WEBPACK_IMPORTED_MODULE_3__.KEY_WAY_STORE_NAME);
-            additionProps.addPrivateRefStoreValue([...initFields, ...saveKeyWay], _ui__WEBPACK_IMPORTED_MODULE_3__.INIT_FIELDS_NAME);
+            // // Безопасно берем keyWay, так как он может быть массивом
+            // const saveKeyWay = typeof keyWay === 'string' ? [keyWay] : keyWay
+            additionProps.addPrivateRefStoreValue([...curKeyWayStore, keyWay], _ui__WEBPACK_IMPORTED_MODULE_3__.KEY_WAY_STORE_NAME);
+            additionProps.addPrivateRefStoreValue([...initFields, keyWay], _ui__WEBPACK_IMPORTED_MODULE_3__.INIT_FIELDS_NAME);
             onChange(value !== undefined ? value : schema.props.defaultValue);
         }
     }
@@ -8993,7 +9002,7 @@ function FormBuilder({ schema, formDataDefault, onChange, onChangeIsError, input
     (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
         let resForm = formData;
         if (clearForm) {
-            const keys = getPrivateRefStoreValue(_consts__WEBPACK_IMPORTED_MODULE_4__.KEY_WAY_STORE_NAME);
+            const keys = getPrivateRefStoreValue(_consts__WEBPACK_IMPORTED_MODULE_4__.KEY_WAY_STORE_NAME) || [];
             resForm = (0,_lib_dict_clearDeepValue__WEBPACK_IMPORTED_MODULE_5__["default"])(resForm, keys);
         }
         onChange && onChange(resForm);
@@ -9253,11 +9262,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var clsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! clsx */ "./node_modules/clsx/dist/clsx.mjs");
 /* harmony import */ var _lib__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @/lib */ "./src/lib/index.ts");
-/* harmony import */ var _consts__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../consts */ "./src/ui/InputFields/DateTimeField/consts/index.ts");
-/* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../styles */ "./src/ui/InputFields/DateTimeField/styles/index.ts");
-/* harmony import */ var _TimeField__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./TimeField */ "./src/ui/InputFields/DateTimeField/ui/TimeField.tsx");
-/* harmony import */ var _DateField__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./DateField */ "./src/ui/InputFields/DateTimeField/ui/DateField.tsx");
-
+/* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../styles */ "./src/ui/InputFields/DateTimeField/styles/index.ts");
+/* harmony import */ var _TimeField__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./TimeField */ "./src/ui/InputFields/DateTimeField/ui/TimeField.tsx");
+/* harmony import */ var _DateField__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./DateField */ "./src/ui/InputFields/DateTimeField/ui/DateField.tsx");
 
 
 
@@ -9269,8 +9276,7 @@ function DateTimeField({ value, fieldConfig = 'datetime', onChange, dateFormat =
     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 });
+        return (0,_lib__WEBPACK_IMPORTED_MODULE_3__.saveParseDate)(value, { from: outFormat, fromTimeZone: timeZone });
     };
     const getDateFromValue = () => {
         if (fieldConfig === 'time' || value === undefined)
@@ -9312,15 +9318,8 @@ function DateTimeField({ value, fieldConfig = 'datetime', onChange, dateFormat =
     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,
+            to: outFormat,
             toTimeZone: timeZone,
         });
         if (typeof res === 'string') {
@@ -9388,14 +9387,14 @@ function DateTimeField({ value, fieldConfig = 'datetime', onChange, dateFormat =
     const getTimeContent = () => {
         if (fieldConfig == 'date')
             return undefined;
-        return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", { className: _styles__WEBPACK_IMPORTED_MODULE_5__.DateTimeFieldStyle.item, children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_TimeField__WEBPACK_IMPORTED_MODULE_6__.TimeField, { ...props, placeholder: timePlaceholder, onChange: setTime, timeZone: timeZone, value: time, timeFormat: timeFormat }) }));
+        return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", { className: _styles__WEBPACK_IMPORTED_MODULE_4__.DateTimeFieldStyle.item, children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_TimeField__WEBPACK_IMPORTED_MODULE_5__.TimeField, { ...props, placeholder: timePlaceholder, onChange: setTime, timeZone: timeZone, value: time, timeFormat: timeFormat }) }));
     };
     const getDateContent = () => {
         if (fieldConfig == 'time')
             return undefined;
-        return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", { className: _styles__WEBPACK_IMPORTED_MODULE_5__.DateTimeFieldStyle.item, children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_DateField__WEBPACK_IMPORTED_MODULE_7__.DateField, { ...props, placeholder: datePlaceholder, value: date, timeZone: timeZone, onChange: setDate, dateFormat: dateFormat }) }));
+        return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", { className: _styles__WEBPACK_IMPORTED_MODULE_4__.DateTimeFieldStyle.item, children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_DateField__WEBPACK_IMPORTED_MODULE_6__.DateField, { ...props, placeholder: datePlaceholder, value: date, timeZone: timeZone, onChange: setDate, dateFormat: dateFormat }) }));
     };
-    return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", { className: (0,clsx__WEBPACK_IMPORTED_MODULE_2__["default"])(_styles__WEBPACK_IMPORTED_MODULE_5__.DateTimeFieldStyle.DateTimeField, additionStyle), children: [getDateContent(), getTimeContent()] }));
+    return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", { className: (0,clsx__WEBPACK_IMPORTED_MODULE_2__["default"])(_styles__WEBPACK_IMPORTED_MODULE_4__.DateTimeFieldStyle.DateTimeField, additionStyle), children: [getDateContent(), getTimeContent()] }));
 }