armtek-uikit-react 1.0.190 → 1.0.192

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/ui/Form/DateField/DateField.js +13 -9
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"armtek-uikit-react","version":"1.0.190","description":"Armtek UIKit for React","main":"cjs/index.js","module":"esm/index.js","types":"esm/index.d.ts","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"clsx":"^2.0.0","rc-slider":"^10.2.1","react":"*","react-datepicker":"4.16.0","react-dom":"*","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"*","react-dom":"*"},"engines":{"node":">=14.0.0"},"scripts":{"pub":"npm version patch && npm publish"}}
1
+ {"name":"armtek-uikit-react","version":"1.0.192","description":"Armtek UIKit for React","main":"cjs/index.js","module":"esm/index.js","types":"esm/index.d.ts","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"clsx":"^2.0.0","rc-slider":"^10.2.1","react":"*","react-datepicker":"4.16.0","react-dom":"*","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"*","react-dom":"*"},"engines":{"node":">=14.0.0"},"scripts":{"pub":"npm version patch && npm publish"}}
package/ui/Form/DateField/DateField.js CHANGED
@@ -26,7 +26,6 @@ const getDateFormat = format => {
26
26
  };
27
27
  exports.getDateFormat = getDateFormat;
28
28
  const DateField = exports.DateField = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
29
- var _dateValue;
30
29
  let {
31
30
  onChange,
32
31
  format = 'dd.MM.yyyy',
@@ -43,10 +42,10 @@ const DateField = exports.DateField = /*#__PURE__*/(0, _react.forwardRef)((props
43
42
  value,
44
43
  ...datepickerProps
45
44
  } = props;
46
- let [date, setDate] = (0, _react.useState)(null);
47
- let [open, setOpen] = (0, _react.useState)(false);
48
- const [text, setText] = (0, _react.useState)('');
49
45
  if (showTime && !showTimeOnly) format = 'dd.MM.yyyy HH:mm';else if (showTimeOnly) format = 'HH:mm';
46
+ const [date, setDate] = (0, _react.useState)(null);
47
+ const [open, setOpen] = (0, _react.useState)(false);
48
+ const [text, setText] = (0, _react.useState)(value ? value.toLocaleString('ru-RU', getDateFormat(format)) : '');
50
49
  const handleChange = d => {
51
50
  setDate(d);
52
51
  setOpen(false);
@@ -68,11 +67,8 @@ const DateField = exports.DateField = /*#__PURE__*/(0, _react.forwardRef)((props
68
67
  setOpen(prev => !prev);
69
68
  if (props.onClick) props.onClick(e);
70
69
  };
71
- let realValue = value !== undefined ? value : date;
72
70
  const btnRef = (0, _react.useRef)();
73
71
  const inputIcon = showTime && showTimeOnly ? 'schedule' : 'calendar_today';
74
- let dateValue = typeof realValue === 'string' ? new Date(realValue) : realValue;
75
- if (!(dateValue instanceof Date && !isNaN(dateValue.getDate()))) dateValue = null;
76
72
  const processChange = value => {
77
73
  if (value.match(/^\d{2}$/) && !text.endsWith('.')) value = value + '.';
78
74
  if (value.match(/^\d{3}$/) && !text.endsWith('.')) value = (0, _insertChar.insertChar)(value, 2, '.');
@@ -87,12 +83,17 @@ const DateField = exports.DateField = /*#__PURE__*/(0, _react.forwardRef)((props
87
83
  const d = new Date(timestamp);
88
84
  if (datepickerProps.minDate && (0, _DateService.isDateBigger)(datepickerProps.minDate, d)) {
89
85
  setText('');
86
+ handleChange(null);
90
87
  } else if (datepickerProps.maxDate && (0, _DateService.isDateBigger)(d, datepickerProps.maxDate)) {
91
88
  setText('');
89
+ handleChange(null);
92
90
  } else {
93
- setText('');
91
+ setText(d.toLocaleString('ru-RU', getDateFormat(format)));
94
92
  handleChange(d);
95
93
  }
94
+ } else {
95
+ setText('');
96
+ handleChange(null);
96
97
  }
97
98
  }
98
99
  };
@@ -102,6 +103,9 @@ const DateField = exports.DateField = /*#__PURE__*/(0, _react.forwardRef)((props
102
103
  const handlePaste = e => {
103
104
  processChange(e.currentTarget.value);
104
105
  };
106
+ let realValue = value !== undefined ? value : date;
107
+ let dateValue = typeof realValue === 'string' ? new Date(realValue) : realValue;
108
+ if (!(dateValue instanceof Date && !isNaN(dateValue.getDate()))) dateValue = null;
105
109
 
106
110
  //TODO Подключение Popover ломает тесты, разобраться почему
107
111
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -113,7 +117,7 @@ const DateField = exports.DateField = /*#__PURE__*/(0, _react.forwardRef)((props
113
117
  error: error,
114
118
  helperText: helperText,
115
119
  ...inputProps,
116
- value: ((_dateValue = dateValue) == null ? void 0 : _dateValue.toLocaleString('ru-RU', getDateFormat(format))) || text || '',
120
+ value: text || '',
117
121
  onChange: handleChangeText,
118
122
  onPaste: handlePaste,
119
123
  endAdornment: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ButtonIcon.default, {