@salutejs/plasma-new-hope 0.336.0-canary.2222.17612018746.0 → 0.336.0-canary.2222.17765869189.0

package/styled-components/es/components/CodeField/hooks/useWebOTP.js

@@ -0,0 +1,236 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(g && (g = 0, op[0] && (_ = 0)), _)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import { useCallback, useEffect, useRef } from "react";
+import { getCodeValue, isWebOTPSupported } from "../utils";
+var isOTPCredential = function(credential) {
+    return credential !== null && 'code' in credential;
+};
+export var useWebOTP = function(param) {
+    var codeString = param.codeString, enableSMSAutoRead = param.enableSMSAutoRead, disabled = param.disabled, codeLength = param.codeLength, codeSetter = param.codeSetter, onFullCodeEnter = param.onFullCodeEnter;
+    var abortControllerRef = useRef(null);
+    var startWebOTPListener = useCallback(function() {
+        return _async_to_generator(function() {
+            var otp, otpCode, newCode, err;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        if (!enableSMSAutoRead || disabled || !isWebOTPSupported()) {
+                            return [
+                                2
+                            ];
+                        }
+                        if (abortControllerRef.current) {
+                            abortControllerRef.current.abort();
+                        }
+                        abortControllerRef.current = new AbortController();
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            3,
+                            ,
+                            4
+                        ]);
+                        return [
+                            4,
+                            navigator.credentials.get({
+                                otp: {
+                                    transport: [
+                                        'sms'
+                                    ]
+                                },
+                                signal: abortControllerRef.current.signal
+                            })
+                        ];
+                    case 2:
+                        otp = _state.sent();
+                        if (otp && isOTPCredential(otp) && otp.code) {
+                            otpCode = otp.code;
+                            if (otpCode.length === codeLength) {
+                                newCode = getCodeValue(codeLength, otpCode);
+                                codeSetter(newCode);
+                                if (onFullCodeEnter) {
+                                    onFullCodeEnter(otpCode);
+                                }
+                            }
+                        }
+                        return [
+                            3,
+                            4
+                        ];
+                    case 3:
+                        err = _state.sent();
+                        if (_instanceof(err, DOMException)) {
+                            if (err.name !== 'AbortError' && err.name !== 'NotAllowedError') {
+                                console.warn('Web OTP API error:', err);
+                            }
+                        } else if (_instanceof(err, Error)) {
+                            console.warn('Web OTP API error:', err);
+                        } else {
+                            console.warn('Unknown Web OTP API error:', err);
+                        }
+                        return [
+                            3,
+                            4
+                        ];
+                    case 4:
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
+    }, [
+        enableSMSAutoRead,
+        disabled,
+        codeLength,
+        onFullCodeEnter
+    ]);
+    var stopWebOTPListener = useCallback(function() {
+        if (abortControllerRef.current) {
+            abortControllerRef.current.abort();
+            abortControllerRef.current = null;
+        }
+    }, []);
+    useEffect(function() {
+        if (isWebOTPSupported() && codeString === '' && enableSMSAutoRead && !disabled) {
+            startWebOTPListener();
+        } else {
+            stopWebOTPListener();
+        }
+        return function() {
+            stopWebOTPListener();
+        };
+    }, [
+        codeString,
+        enableSMSAutoRead,
+        disabled,
+        startWebOTPListener,
+        stopWebOTPListener
+    ]);
+};

package/styled-components/es/components/CodeField/utils/handleCodeError.js

@@ -27,7 +27,7 @@ import { classes } from "../CodeField.tokens";
 import { ANIMATION_TIMEOUT } from "./constants";
 import { getCodeValue } from "./initialValuesHelper";
 export var handleCodeError = function(param) {
-    var codeLength = param.codeLength, codeErrorBehavior = param.codeErrorBehavior, currentCode = param.currentCode, inputRefs = param.inputRefs, inputContainerRef = param.inputContainerRef, captionRef = param.captionRef, setCode = param.setCode, codeSetter = param.codeSetter;
+    var codeLength = param.codeLength, codeErrorBehavior = param.codeErrorBehavior, currentCode = param.currentCode, inputRefs = param.inputRefs, inputContainerRef = param.inputContainerRef, captionRef = param.captionRef, setInnerValue = param.setInnerValue, codeSetter = param.codeSetter;
     if (!inputContainerRef.current) {
         return;
     }
@@ -41,7 +41,7 @@ export var handleCodeError = function(param) {
                 var newCode = _to_consumable_array(currentCode);
                 newCode.pop();
                 codeSetter(newCode);
-                setCode(currentCode);
+                setInnerValue(currentCode);
                 (_inputContainerRef_current = inputContainerRef.current) === null || _inputContainerRef_current === void 0 ? void 0 : _inputContainerRef_current.classList.remove(classes.codeErrorAnimation);
                 setTimeout(function() {
                     var _inputRefs_current_, _inputRefs_current_1;

package/styled-components/es/components/CodeField/utils/handleItemError.js

@@ -26,14 +26,17 @@ function _unsupported_iterable_to_array(o, minLen) {
 import { classes } from "../CodeField.tokens";
 import { ANIMATION_TIMEOUT } from "./constants";
 export var handleItemError = function(param) {
-    var currentSymbol = param.currentSymbol, itemErrorBehavior = param.itemErrorBehavior, index = param.index, newCode = param.newCode, inputRefs = param.inputRefs, setCode = param.setCode, codeSetter = param.codeSetter;
+    var currentSymbol = param.currentSymbol, itemErrorBehavior = param.itemErrorBehavior, index = param.index, newCode = param.newCode, inputRefs = param.inputRefs, setInnerValue = param.setInnerValue, codeSetter = param.codeSetter, onChange = param.onChange;
     if (!inputRefs.current[index] || currentSymbol === ' ') {
         return;
     }
     switch(itemErrorBehavior){
         case 'keep':
             var _inputRefs_current_index;
-            setCode(newCode);
+            setInnerValue(newCode);
+            if (onChange) {
+                onChange(newCode.join(''));
+            }
             (_inputRefs_current_index = inputRefs.current[index]) === null || _inputRefs_current_index === void 0 ? void 0 : _inputRefs_current_index.classList.add(classes.itemError, classes.itemErrorAnimation);
             setTimeout(function() {
                 var _inputRefs_current_index;
@@ -47,11 +50,17 @@ export var handleItemError = function(param) {
         case 'forbid-enter':
             newCode[index] = '';
             codeSetter(newCode);
+            if (onChange) {
+                onChange(newCode.join(''));
+            }
             break;
         case 'remove-symbol':
         default:
             var _inputRefs_current_index1;
-            setCode(newCode);
+            setInnerValue(newCode);
+            if (onChange) {
+                onChange(newCode.join(''));
+            }
             (_inputRefs_current_index1 = inputRefs.current[index]) === null || _inputRefs_current_index1 === void 0 ? void 0 : _inputRefs_current_index1.classList.add(classes.itemError, classes.itemErrorFade, classes.itemErrorAnimation);
             setTimeout(function() {
                 var _inputRefs_current_index;

package/styled-components/es/components/CodeField/utils/index.js

@@ -1,3 +1,4 @@
 export { getFieldPattern, getPlaceholderValue, getCodeValue } from "./initialValuesHelper";
 export { handleItemError } from "./handleItemError";
 export { handleCodeError } from "./handleCodeError";
+export { isWebOTPSupported } from "./isWebOTPSupported";

package/styled-components/es/components/CodeField/utils/isWebOTPSupported.js

@@ -0,0 +1,3 @@
+export var isWebOTPSupported = function() {
+    return typeof window !== 'undefined' && 'OTPCredential' in window && navigator.credentials && typeof navigator.credentials.get === 'function';
+};

package/styled-components/es/components/Combobox/ComboboxNew/Combobox.js

@@ -6,9 +6,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -22,9 +19,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -52,9 +46,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -124,9 +115,6 @@ function _object_without_properties_loose(source, excluded) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -147,7 +135,7 @@ import { sizeToIconSize } from "../../Select/utils";
 import { classes } from "./Combobox.tokens";
 import { FloatingPopover } from "./FloatingPopover";
 import { useKeyNavigation, getItemByFocused } from "./hooks/useKeyboardNavigation";
-import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getRemovedElement, getTextValue } from "./utils";
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getTextValue } from "./utils";
 import { Inner, StyledTextField, VirtualList, SelectAll } from "./ui";
 import { pathReducer, focusedPathReducer } from "./reducers";
 import { getPathMap, getTreeMaps } from "./hooks/getPathMaps";
@@ -218,10 +206,11 @@ import { Context } from "./Combobox.context";
             return getTreeMaps(transformedItems);
         }, [
             items
-        ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], labelToItemMap = _useMemo[2];
+        ]), 2), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1];
         var _useState = _sliced_to_array(useState(getTextValue(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValue = _useState[1];
         var _useState1 = _sliced_to_array(useState(multiple ? [] : ''), 2), internalValue = _useState1[0], setInternalValue = _useState1[1];
         var value = outerValue !== null && outerValue !== undefined ? outerValue : internalValue;
+        var rootRef = useRef(null);
         var inputRef = useRef(null);
         var floatingPopoverRef = useRef(null);
         var inputForkRef = useForkRef(inputRef, ref);
@@ -256,15 +245,7 @@ import { Context } from "./Combobox.context";
             if (!isCurrentListOpen || alwaysOpened) {
                 return;
             }
-            dispatchPath({
-                type: 'reset'
-            });
-            dispatchFocusedPath({
-                type: 'reset'
-            });
-            if (onToggle) {
-                onToggle(false);
-            }
+            handleListToggle(false);
             // Возвращаем актуальное значение поля ввода после закрытия выпадающего списка.
             setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
         }, floatingPopoverRef);
@@ -306,39 +287,18 @@ import { Context } from "./Combobox.context";
             }
         };
         // Обработчик чипов
-        var handleChipsChange = function(chipLabels) {
+        var handleChipClick = function(chip) {
             if (!Array.isArray(value)) return;
-            // TODO: #1564
-            // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
-            if (renderValue && !isTargetAmount) {
-                var resultValues = _to_consumable_array(value);
-                value.forEach(function(_, index) {
+            if (isTargetAmount) {
+                // При закрытии чипа в режиме isTargetAmount в value оставляем только disabled-элементы
+                onChange(value.filter(function(val) {
                     var _valueToItemMap_get;
-                    var stringValue = value[index];
-                    var label = (_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label;
-                    var labelAfterRenderValue = renderValue(label ? labelToItemMap.get(label) : {
-                        value: stringValue,
-                        label: stringValue.toString()
-                    });
-                    if (!chipLabels.includes(labelAfterRenderValue)) {
-                        resultValues.splice(index, 1);
-                    }
-                });
-                var removedItemValue = getRemovedElement(value, resultValues, isTargetAmount);
-                onChange(resultValues, removedItemValue ? valueToItemMap.get(removedItemValue) || {
-                    value: removedItemValue,
-                    label: removedItemValue.toString()
-                } : null);
+                    return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                }));
             } else {
-                var newValues = chipLabels.map(function(chipLabel) {
-                    var _labelToItemMap_get;
-                    return ((_labelToItemMap_get = labelToItemMap.get(chipLabel)) === null || _labelToItemMap_get === void 0 ? void 0 : _labelToItemMap_get.value) || chipLabel;
-                });
-                var removedItemValue1 = getRemovedElement(value, newValues, isTargetAmount);
-                onChange(newValues, removedItemValue1 ? valueToItemMap.get(removedItemValue1) || {
-                    value: removedItemValue1,
-                    label: removedItemValue1.toString()
-                } : null);
+                onChange(value.filter(function(val) {
+                    return val !== chip.value;
+                }), valueToItemMap.get(chip.value) || null);
             }
         };
         // Обработчик открытия/закрытия выпадающего списка
@@ -351,12 +311,18 @@ import { Context } from "./Combobox.context";
                     type: 'opened_first_level'
                 });
             } else {
+                var _rootRef_current;
                 dispatchFocusedPath({
                     type: 'reset'
                 });
                 dispatchPath({
                     type: 'reset'
                 });
+                // Скроллим чипы к левому краю при закрытии компонента
+                var el = rootRef === null || rootRef === void 0 ? void 0 : (_rootRef_current = rootRef.current) === null || _rootRef_current === void 0 ? void 0 : _rootRef_current.querySelector('.input-scrollable-wrapper');
+                if (multiple && value.length > 0 && el) {
+                    el.scrollLeft = 0;
+                }
             }
             if (onToggle) {
                 onToggle(opened);
@@ -368,14 +334,32 @@ import { Context } from "./Combobox.context";
                 return;
             }
             var checkedCopy = new Map(checked);
-            if (!checkedCopy.get(item.value)) {
-                checkedCopy.set(item.value, true);
-                updateDescendants(item, checkedCopy, true, valueToItemMap);
-            } else {
-                checkedCopy.set(item.value, false);
-                updateDescendants(item, checkedCopy, false);
+            switch(checkedCopy.get(item.value)){
+                // Если чекбокс в состоянии indeterminate
+                case 'indeterminate':
+                    {
+                        updateDescendants(item, checkedCopy, true, valueToItemMap);
+                        break;
+                    }
+                // Если чекбокс в состоянии checked
+                case true:
+                    {
+                        updateDescendants(item, checkedCopy, false, valueToItemMap);
+                        checkedCopy.set(item.value, false);
+                        break;
+                    }
+                // Если чекбокс в состоянии unchecked
+                case false:
+                    {
+                        updateDescendants(item, checkedCopy, true, valueToItemMap);
+                        checkedCopy.set(item.value, true);
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
             }
-            updateAncestors(item, checkedCopy);
             var newValues = [];
             valueToItemMap.forEach(function(item, key) {
                 if (checkedCopy.get(key)) {
@@ -442,20 +426,28 @@ import { Context } from "./Combobox.context";
                 if (value.length === 0) return [];
                 if (isTargetAmount) {
                     return [
-                        "Выбрано ".concat(targetAmount || value.length)
+                        {
+                            value: '_removeAll',
+                            label: "Выбрано ".concat(targetAmount || value.length),
+                            disabled: value.every(function(val) {
+                                var _valueToItemMap_get;
+                                return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                            })
+                        }
                     ];
                 }
-                var renderValueMapper = renderValue && function(stringValue) {
-                    return renderValue(valueToItemMap.get(stringValue) || {
-                        value: stringValue,
-                        label: stringValue.toString()
-                    });
-                };
-                var valueToItemMapper = function(stringValue) {
-                    var _valueToItemMap_get;
-                    return ((_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || stringValue.toString();
-                };
-                return value.map(renderValueMapper || valueToItemMapper);
+                return value.map(function(value) {
+                    var _valueToItemMap_get, _valueToItemMap_get1;
+                    var currentLabel = renderValue ? renderValue(valueToItemMap.get(value) || {
+                        value: value,
+                        label: value
+                    }) : ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value.toString();
+                    return {
+                        value: value,
+                        label: currentLabel,
+                        disabled: ((_valueToItemMap_get1 = valueToItemMap.get(value)) === null || _valueToItemMap_get1 === void 0 ? void 0 : _valueToItemMap_get1.disabled) || false
+                    };
+                });
             }
             return [];
         };
@@ -541,7 +533,8 @@ import { Context } from "./Combobox.context";
             readOnly: readOnly,
             name: name,
             hintView: hintView,
-            hintSize: hintSize
+            hintSize: hintSize,
+            ref: rootRef
         }, name && /*#__PURE__*/ React.createElement(SelectNative, {
             items: valueToItemMap,
             name: name,
@@ -612,8 +605,8 @@ import { Context } from "./Combobox.context";
                     keepPlaceholder: keepPlaceholder
                 }, multiple ? {
                     enumerationType: 'chip',
-                    chips: getChips(),
-                    onChangeChips: handleChipsChange
+                    _chips: getChips(),
+                    _onChipClick: handleChipClick
                 } : {
                     enumerationType: 'plain'
                 }, rest), {

package/styled-components/es/components/Combobox/ComboboxNew/hooks/getPathMaps.js

@@ -24,16 +24,14 @@ export var getPathMap = function(items) {
 export var getTreeMaps = function(items) {
     var valueToCheckedMap = new Map();
     var valueToItemMap = new Map();
-    var labelToItemMap = new Map();
     var rec = function(items) {
         var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
         items === null || items === void 0 ? void 0 : items.forEach(function(item, index) {
-            var value = item.value, label = item.label, innerItems = item.items;
+            var value = item.value, innerItems = item.items;
             var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
             valueToCheckedMap.set(value, false);
             if (isEmpty(innerItems) || !innerItems) {
                 valueToItemMap.set(value, item);
-                labelToItemMap.set(label, item);
             } else {
                 rec(innerItems, currIndex);
             }
@@ -42,7 +40,6 @@ export var getTreeMaps = function(items) {
     rec(items);
     return [
         valueToCheckedMap,
-        valueToItemMap,
-        labelToItemMap
+        valueToItemMap
     ];
 };

package/styled-components/es/components/Combobox/ComboboxNew/utils/index.js

@@ -5,5 +5,4 @@ export { updateSingleAncestors } from "./updateSingleAncestors";
 export { sizeToIconSize } from "./sizeToIconSize";
 export { filterItems } from "./filterItems";
 export { getItemId } from "./getItemId";
-export { getRemovedElement } from "./getRemovedElement";
 export { getTextValue } from "./getTextValue";

package/styled-components/es/components/DatePicker/RangeDate/RangeDate.js

@@ -325,16 +325,6 @@ export var datePickerRangeRoot = function(Root) {
                 return;
             }
             var isCalendarOpen = ((firstInputRef === null || firstInputRef === void 0 ? void 0 : (_firstInputRef_current = firstInputRef.current) === null || _firstInputRef_current === void 0 ? void 0 : _firstInputRef_current.contains((event === null || event === void 0 ? void 0 : event.target) || null)) || (secondInputRef === null || secondInputRef === void 0 ? void 0 : (_secondInputRef_current = secondInputRef.current) === null || _secondInputRef_current === void 0 ? void 0 : _secondInputRef_current.contains((event === null || event === void 0 ? void 0 : event.target) || null))) && (event === null || event === void 0 ? void 0 : event.code) !== keys.Escape ? true : currentOpened;
-            if (!isCalendarOpen) {
-                if (calendarFirstValue && !calendarSecondValue) {
-                    var _secondInputRef_current1;
-                    secondInputRef === null || secondInputRef === void 0 ? void 0 : (_secondInputRef_current1 = secondInputRef.current) === null || _secondInputRef_current1 === void 0 ? void 0 : _secondInputRef_current1.focus();
-                }
-                if (calendarSecondValue && !calendarFirstValue) {
-                    var _firstInputRef_current1;
-                    firstInputRef === null || firstInputRef === void 0 ? void 0 : (_firstInputRef_current1 = firstInputRef.current) === null || _firstInputRef_current1 === void 0 ? void 0 : _firstInputRef_current1.focus();
-                }
-            }
             if (!isCalendarOpen) {
                 setSecondTextFieldClicked(false);
             }
@@ -373,28 +363,40 @@ export var datePickerRangeRoot = function(Root) {
             }, commonArgs)), endOriginalDate = _getFormattedDates1.originalDate;
             if (!calendarFirstValue && correctStartDates.calendar) {
                 startOriginalDate = new Date(correctStartDates.calendar);
+            }
+            if (!calendarSecondValue && correctEndDates.calendar) {
+                endOriginalDate = new Date(correctEndDates.calendar);
+            }
+            var _getSortedValues = _sliced_to_array(getSortedValues([
+                startOriginalDate,
+                endOriginalDate
+            ]), 2), startValue = _getSortedValues[0], endValue = _getSortedValues[1];
+            var _getFormattedDates2 = getFormattedDates(_object_spread({
+                value: startValue,
+                delimiter: dateFormatDelimiter
+            }, commonArgs)), formattedFirstDate = _getFormattedDates2.formattedDate, originalFirstDate = _getFormattedDates2.originalDate, isoFirstDate = _getFormattedDates2.isoDate;
+            var _getFormattedDates3 = getFormattedDates(_object_spread({
+                value: endValue,
+                delimiter: dateFormatDelimiter
+            }, commonArgs)), formattedSecondDate = _getFormattedDates3.formattedDate, originalSecondDate = _getFormattedDates3.originalDate, isoSecondDate = _getFormattedDates3.isoDate;
+            if (formattedFirstDate !== inputFirstValue) {
                 if (onChangeFirstValue) {
-                    onChangeFirstValue(event, correctStartDates.input, correctStartDates.calendar, correctStartDates.calendar.toISOString());
+                    onChangeFirstValue(event, formattedFirstDate, originalFirstDate, isoFirstDate);
                 }
                 if (onCommitFirstDate) {
-                    var dateInfo = getFirstQuarterInfo(correctStartDates.calendar);
-                    onCommitFirstDate(correctStartDates.input, false, true, dateInfo, correctStartDates.calendar, correctStartDates.calendar.toISOString());
+                    var dateInfo = originalFirstDate ? getFirstQuarterInfo(originalFirstDate) : undefined;
+                    onCommitFirstDate(formattedFirstDate, false, true, dateInfo, originalFirstDate, isoFirstDate);
                 }
             }
-            if (!calendarSecondValue && correctEndDates.calendar) {
-                endOriginalDate = new Date(correctEndDates.calendar);
+            if (formattedSecondDate !== inputSecondValue) {
                 if (onChangeSecondValue) {
-                    onChangeSecondValue(event, correctEndDates.input, correctEndDates.calendar, correctEndDates.calendar.toISOString());
+                    onChangeSecondValue(event, formattedSecondDate, originalSecondDate, isoSecondDate);
                 }
                 if (onCommitSecondDate) {
-                    var dateInfo1 = getSecondQuarterInfo(correctEndDates.calendar);
-                    onCommitSecondDate(correctEndDates.input, false, true, dateInfo1, correctEndDates.calendar, correctEndDates.calendar.toISOString());
+                    var dateInfo1 = originalSecondDate ? getSecondQuarterInfo(originalSecondDate) : undefined;
+                    onCommitSecondDate(formattedSecondDate, false, true, dateInfo1, originalSecondDate, isoSecondDate);
                 }
             }
-            var _getSortedValues = _sliced_to_array(getSortedValues([
-                startOriginalDate,
-                endOriginalDate
-            ]), 2), startValue = _getSortedValues[0], endValue = _getSortedValues[1];
             setFirstInputValue(startValue);
             setSecondInputValue(endValue);
             outerHandler === null || outerHandler === void 0 ? void 0 : outerHandler(event);