intelicoreact 0.0.71 → 0.0.75
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.
- package/dist/Atomic/FormElements/InputDateRange/InputDateRange.js +6 -4
- package/dist/Atomic/FormElements/InputDateRange/components/Datepicker.js +7 -5
- package/package.json +1 -1
- package/src/Atomic/FormElements/InputDateRange/InputDateRange.js +5 -5
- package/src/Atomic/FormElements/InputDateRange/components/Datepicker.js +8 -5
- package/src/Atomic/FormElements/InputDateRange/components/OpenedPart.js +2 -2
|
@@ -96,12 +96,14 @@ var InputDateRange = function InputDateRange(props) {
|
|
|
96
96
|
return formatedValue;
|
|
97
97
|
};
|
|
98
98
|
|
|
99
|
-
(0, _react.useEffect)(function () {
|
|
100
|
-
handleChange(_objectSpread({}, value));
|
|
101
|
-
}, []);
|
|
102
|
-
|
|
103
99
|
var Range = function Range() {
|
|
104
100
|
var SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
|
|
101
|
+
|
|
102
|
+
if (!actualValues.start && value.start) {
|
|
103
|
+
actualValues.start = value.start;
|
|
104
|
+
actualValues.end = value.end || '';
|
|
105
|
+
}
|
|
106
|
+
|
|
105
107
|
var start = actualValues.start,
|
|
106
108
|
end = actualValues.end;
|
|
107
109
|
if (!start || !end) return null;
|
|
@@ -384,6 +384,8 @@ var Datepicker = function Datepicker(props) {
|
|
|
384
384
|
if (code === 27) doBlur(type, e);
|
|
385
385
|
};
|
|
386
386
|
|
|
387
|
+
var startDateValue = startDate ? (0, _momentTimezone.default)(startDate).format('ll') : '';
|
|
388
|
+
var endDateValue = endDate ? (0, _momentTimezone.default)(endDate).subtract(1, 'm').format('ll') : '';
|
|
387
389
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
388
390
|
className: (0, _classnames.default)('date-picker', className)
|
|
389
391
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -392,15 +394,15 @@ var Datepicker = function Datepicker(props) {
|
|
|
392
394
|
className: "date-picker__inputs-block"
|
|
393
395
|
}, /*#__PURE__*/_react.default.createElement(_Input.default, {
|
|
394
396
|
dataTest: "datepicker_start-date-input",
|
|
395
|
-
className: (0, _classnames.default)(
|
|
397
|
+
className: (0, _classnames.default)({
|
|
396
398
|
'date-picker__date-input_active': hoverStatus === 'start'
|
|
397
399
|
}),
|
|
398
|
-
value: isStartFocused ? startDateInput :
|
|
399
|
-
disabled: !startDate,
|
|
400
|
+
value: isStartFocused ? startDateInput : startDateValue,
|
|
400
401
|
onChange: function onChange(value) {
|
|
401
402
|
return setStartDateInput(handleDateInputOnChange(value));
|
|
402
403
|
},
|
|
403
404
|
onFocus: handleStartDateFocus,
|
|
405
|
+
disabled: !startDate,
|
|
404
406
|
onBlur: handleStartDateBlur,
|
|
405
407
|
onKeyUp: function onKeyUp(code, e) {
|
|
406
408
|
return handleKeyPressed(code, e, 'start');
|
|
@@ -421,10 +423,10 @@ var Datepicker = function Datepicker(props) {
|
|
|
421
423
|
className: "date-picker__inputs-separator date-picker__header--gray"
|
|
422
424
|
}, "\u2014"), /*#__PURE__*/_react.default.createElement(_Input.default, {
|
|
423
425
|
dataTest: "datepicker_end-date-input",
|
|
424
|
-
className: (0, _classnames.default)(
|
|
426
|
+
className: (0, _classnames.default)({
|
|
425
427
|
'date-picker__date-input_active': hoverStatus === 'end'
|
|
426
428
|
}),
|
|
427
|
-
value: isEndFocused ? endDateInput :
|
|
429
|
+
value: isEndFocused ? endDateInput : endDateValue,
|
|
428
430
|
disabled: !endDate,
|
|
429
431
|
onChange: function onChange(value) {
|
|
430
432
|
return setEndDateInput(handleDateInputOnChange(value));
|
package/package.json
CHANGED
|
@@ -49,12 +49,12 @@ const InputDateRange = props => {
|
|
|
49
49
|
return formatedValue;
|
|
50
50
|
};
|
|
51
51
|
|
|
52
|
-
useEffect(() => {
|
|
53
|
-
handleChange({ ...value });
|
|
54
|
-
}, []);
|
|
55
|
-
|
|
56
52
|
const Range = () => {
|
|
57
53
|
const SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
|
|
54
|
+
if (!actualValues.start && value.start) {
|
|
55
|
+
actualValues.start = value.start;
|
|
56
|
+
actualValues.end = value.end || '';
|
|
57
|
+
}
|
|
58
58
|
const { start, end } = actualValues;
|
|
59
59
|
if (!start || !end) return null;
|
|
60
60
|
|
|
@@ -157,7 +157,7 @@ const InputDateRange = props => {
|
|
|
157
157
|
<div className="date-range-input__interval-key">
|
|
158
158
|
<span>
|
|
159
159
|
{(txt?.labels && txt.labels[actualValues?.intervalKey]) ??
|
|
160
|
-
|
|
160
|
+
(INTERVALS[actualValues?.intervalKey]?.label || CUSTOM_INTERVAL_KEY_TEXT)}
|
|
161
161
|
</span>
|
|
162
162
|
{current !== ALL_TIME_KEY && <span>:</span>}
|
|
163
163
|
</div>
|
|
@@ -294,17 +294,20 @@ const Datepicker = props => {
|
|
|
294
294
|
if (code === 27) doBlur(type, e);
|
|
295
295
|
};
|
|
296
296
|
|
|
297
|
+
const startDateValue = startDate ? moment(startDate).format('ll') : '';
|
|
298
|
+
const endDateValue = endDate ? moment(endDate).subtract(1, 'm').format('ll') : '';
|
|
299
|
+
|
|
297
300
|
return (
|
|
298
301
|
<div className={cn('date-picker', className)}>
|
|
299
302
|
<div className="date-picker__header">
|
|
300
303
|
<div className="date-picker__inputs-block">
|
|
301
304
|
<TextInput
|
|
302
305
|
dataTest="datepicker_start-date-input"
|
|
303
|
-
className={cn(
|
|
304
|
-
value={isStartFocused ? startDateInput :
|
|
305
|
-
disabled={!startDate}
|
|
306
|
+
className={cn( { 'date-picker__date-input_active': hoverStatus === 'start' })}
|
|
307
|
+
value={isStartFocused ? startDateInput : startDateValue}
|
|
306
308
|
onChange={value => setStartDateInput(handleDateInputOnChange(value))}
|
|
307
309
|
onFocus={handleStartDateFocus}
|
|
310
|
+
disabled={!startDate}
|
|
308
311
|
onBlur={handleStartDateBlur}
|
|
309
312
|
onKeyUp={(code, e) => handleKeyPressed(code, e, 'start')}
|
|
310
313
|
//ref={startDateInputRef}
|
|
@@ -322,8 +325,8 @@ const Datepicker = props => {
|
|
|
322
325
|
<div className="date-picker__inputs-separator date-picker__header--gray">—</div>
|
|
323
326
|
<TextInput
|
|
324
327
|
dataTest="datepicker_end-date-input"
|
|
325
|
-
className={cn(
|
|
326
|
-
value={isEndFocused ? endDateInput :
|
|
328
|
+
className={cn({ 'date-picker__date-input_active': hoverStatus === 'end' })}
|
|
329
|
+
value={isEndFocused ? endDateInput : endDateValue}
|
|
327
330
|
disabled={!endDate}
|
|
328
331
|
onChange={value => setEndDateInput(handleDateInputOnChange(value))}
|
|
329
332
|
onFocus={handleEndDateFocus}
|
|
@@ -27,9 +27,9 @@ const OpenedPart = React.forwardRef((props, ref) => {
|
|
|
27
27
|
toggleOff,
|
|
28
28
|
isShortWeekNames
|
|
29
29
|
} = props;
|
|
30
|
-
|
|
30
|
+
|
|
31
31
|
const items = isCompact ? [...Object.keys(intervals)] : [...Object.keys(intervals), customKey];
|
|
32
|
-
|
|
32
|
+
|
|
33
33
|
const [activeInterval, setActiveInterval] = useState(actualValues.intervalKey);
|
|
34
34
|
|
|
35
35
|
const handleItemClick = item => {
|