@salutejs/plasma-new-hope 0.163.0-canary.1466.11254522155.0 → 0.163.0-canary.1475.11258202491.0

package/emotion/cjs/components/DatePicker/hooks/useDatePicker.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.useDatePicker = void 0;
 var _DatePicker = /*#__PURE__*/require("../DatePicker.tokens");
 var _dateHelper = /*#__PURE__*/require("../utils/dateHelper");
-var _datejs = /*#__PURE__*/require("../../../utils/datejs");
 var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
   var currentValue = _ref.currentValue,
     setInputValue = _ref.setInputValue,
     setCalendarValue = _ref.setCalendarValue,
-    setIsInnerOpen = _ref.setIsInnerOpen,
     dateFormatDelimiter = _ref.dateFormatDelimiter,
     format = _ref.format,
     _ref$lang = _ref.lang,
@@ -21,24 +19,12 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
     maskWithFormat = _ref.maskWithFormat,
     valueError = _ref.valueError,
     valueSuccess = _ref.valueSuccess,
-    inputRef = _ref.inputRef,
     name = _ref.name,
-    onToggle = _ref.onToggle,
     onChangeValue = _ref.onChangeValue,
     onCommitDate = _ref.onCommitDate,
     onChange = _ref.onChange;
   var datePickerErrorClass = valueError ? _DatePicker.classes.datePickerError : undefined;
   var datePickerSuccessClass = valueSuccess ? _DatePicker.classes.datePickerSuccess : undefined;
-  var handleToggle = function handleToggle(opened, event) {
-    if (disabled || readOnly) {
-      return;
-    }
-    var isCalendarOpen = event.target === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) ? true : opened;
-    if (onToggle) {
-      return onToggle(isCalendarOpen, event);
-    }
-    setIsInnerOpen(isCalendarOpen);
-  };
   var handleChangeValue = function handleChangeValue(event) {
     if (disabled || readOnly) {
       return;
@@ -61,24 +47,14 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       });
       return;
     }
-
-    /**
-     * NOTE: если в формате даты есть месяц в полном названии или сокращенном,
-     * нужно дополнительно проводить валидацию на полноту введенной даты.
-     * Иначе dayjs циклически будет пытаться отформатировать некорректную дату.
-     */
-    var hasMonthFullName = /M{3,4}/g.test(format);
-    var isValidMonth;
-    var isLengthEqual;
-    if (hasMonthFullName) {
-      _datejs.customDayjs.locale(lang);
-      var firstIndexOfMonth = format.indexOf('M');
-      var lastIndexOfMonth = newValue.indexOf(dateFormatDelimiter(), firstIndexOfMonth);
-      var fullMonthName = !lastIndexOfMonth ? newValue.slice(firstIndexOfMonth) : newValue.slice(firstIndexOfMonth, lastIndexOfMonth);
-      var monthFormatting = format.replace(/[^M]/g, '');
-      isValidMonth = (0, _datejs.customDayjs)("01 ".concat(fullMonthName, " 1970"), "DD ".concat(monthFormatting, " YYYY"), true).isValid();
-      isLengthEqual = format.length - monthFormatting.length === newValue.length - fullMonthName.length;
-    }
+    var _validateDateWithFull = (0, _dateHelper.validateDateWithFullMonth)({
+        currentValue: newValue,
+        format: format,
+        lang: lang
+      }),
+      hasMonthFullName = _validateDateWithFull.hasMonthFullName,
+      isValidMonth = _validateDateWithFull.isValidMonth,
+      isLengthEqual = _validateDateWithFull.isLengthEqual;
     if (!hasMonthFullName && (newValue === null || newValue === void 0 ? void 0 : newValue.length) === (format === null || format === void 0 ? void 0 : format.length) || isValidMonth && isLengthEqual) {
       setCalendarValue((0, _dateHelper.formatCalendarValue)(newValue, format, lang));
     }
@@ -108,20 +84,18 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       return onCommitDate === null || onCommitDate === void 0 ? void 0 : onCommitDate('', false, true);
     }
     if (isCalendarValue) {
-      setCalendarValue((0, _dateHelper.formatCalendarValue)(date, format, lang));
-      setInputValue((0, _dateHelper.formatInputValue)({
+      var _formattedInputValue = (0, _dateHelper.formatInputValue)({
         value: date,
         format: format,
         lang: lang
-      }));
+      });
+      setCalendarValue((0, _dateHelper.formatCalendarValue)(date, format, lang));
+      setInputValue(_formattedInputValue);
       onCommitDate === null || onCommitDate === void 0 || onCommitDate(date, false, true, dateInfo);
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(null, _formattedInputValue);
       onChange === null || onChange === void 0 || onChange({
         target: {
-          value: (0, _dateHelper.formatInputValue)({
-            value: date,
-            format: format,
-            lang: lang
-          }),
+          value: _formattedInputValue,
           name: name
         }
       });
@@ -132,19 +106,18 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       newDate = _getDateFromFormat.value,
       isError = _getDateFromFormat.isError,
       isSuccess = _getDateFromFormat.isSuccess;
-    setCalendarValue((0, _dateHelper.formatCalendarValue)(newDate, format, lang));
-    setInputValue((0, _dateHelper.formatInputValue)({
+    var formattedInputValue = (0, _dateHelper.formatInputValue)({
       value: newDate,
       format: format,
       lang: lang
-    }));
+    });
+    setCalendarValue((0, _dateHelper.formatCalendarValue)(newDate, format, lang));
+    setInputValue(formattedInputValue);
     onCommitDate === null || onCommitDate === void 0 || onCommitDate(newDate, isError, isSuccess);
+    onChangeValue === null || onChangeValue === void 0 || onChangeValue(null, formattedInputValue);
     onChange === null || onChange === void 0 || onChange({
       target: {
-        value: (0, _dateHelper.formatInputValue)({
-          value: date,
-          format: format
-        }),
+        value: formattedInputValue,
         name: name
       }
     });
@@ -152,7 +125,6 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
   return {
     datePickerErrorClass: datePickerErrorClass,
     datePickerSuccessClass: datePickerSuccessClass,
-    handleToggle: handleToggle,
     handleChangeValue: handleChangeValue,
     handleCommitDate: handleCommitDate
   };

package/emotion/cjs/components/DatePicker/hooks/useKeyboardNavigation.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useKeyNavigation = exports.keys = void 0;
 var keys = exports.keys = {
-  Space: 'Space'
+  Space: 'Space',
+  Escape: 'Escape'
 };
 var useKeyNavigation = exports.useKeyNavigation = function useKeyNavigation(_ref) {
   var isCalendarOpen = _ref.isCalendarOpen,
+    closeOnEsc = _ref.closeOnEsc,
     onToggle = _ref.onToggle;
   var onKeyDown = function onKeyDown(event) {
     switch (event.code) {
@@ -20,6 +22,14 @@ var useKeyNavigation = exports.useKeyNavigation = function useKeyNavigation(_ref
           }
           break;
         }
+      case keys.Escape:
+        {
+          if (isCalendarOpen && closeOnEsc) {
+            event.preventDefault();
+            onToggle(false, event);
+          }
+          break;
+        }
       default:
         {
           break;

package/emotion/cjs/components/DatePicker/utils/dateHelper.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMaskedDateOnInput = exports.getDateFromFormat = exports.getDateFormatDelimiter = exports.formatInputValue = exports.formatCalendarValue = void 0;
+exports.validateDateWithFullMonth = exports.getMaskedDateOnInput = exports.getDateFromFormat = exports.getDateFormatDelimiter = exports.formatInputValue = exports.formatCalendarValue = void 0;
 var _datejs = /*#__PURE__*/require("../../../utils/datejs");
 var formatInputValue = exports.formatInputValue = function formatInputValue(_ref) {
   var value = _ref.value,
@@ -84,4 +84,34 @@ var getMaskedDateOnInput = exports.getMaskedDateOnInput = function getMaskedDate
     return value + delimiter;
   }
   return value;
+};
+var validateDateWithFullMonth = exports.validateDateWithFullMonth = function validateDateWithFullMonth(_ref2) {
+  var currentValue = _ref2.currentValue,
+    format = _ref2.format,
+    lang = _ref2.lang;
+  /**
+   * NOTE: если в формате даты есть месяц в полном названии или сокращенном,
+   * нужно дополнительно проводить валидацию на полноту введенной даты.
+   * Иначе dayjs циклически будет пытаться отформатировать некорректную дату.
+   */
+  var hasMonthFullName = /M{3,4}/g.test(format);
+  if (!hasMonthFullName) {
+    return {
+      hasMonthFullName: hasMonthFullName,
+      isValidMonth: false,
+      isLengthEqual: false
+    };
+  }
+  _datejs.customDayjs.locale(lang);
+  var firstIndexOfMonth = format.indexOf('M');
+  var lastIndexOfMonth = currentValue.indexOf(getDateFormatDelimiter(format), firstIndexOfMonth);
+  var fullMonthName = !lastIndexOfMonth ? currentValue.slice(firstIndexOfMonth) : currentValue.slice(firstIndexOfMonth, lastIndexOfMonth);
+  var monthFormatting = format.replace(/[^M]/g, '');
+  var isValidMonth = (0, _datejs.customDayjs)("01 ".concat(fullMonthName, " 1970"), "DD ".concat(monthFormatting, " YYYY"), true).isValid();
+  var isLengthEqual = format.length - monthFormatting.length === currentValue.length - fullMonthName.length;
+  return {
+    hasMonthFullName: hasMonthFullName,
+    isValidMonth: isValidMonth,
+    isLengthEqual: isLengthEqual
+  };
 };