@mailstep/design-system 0.7.31-beta.2 → 0.7.31-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mailstep/design-system",
-  "version": "0.7.31-beta.2",
+  "version": "0.7.31-beta.4",
   "license": "ISC",
   "type": "module",
   "main": "./ui/index.js",

package/ui/Blocks/CommonGrid/components/Filters/DatePickerRange/DatePickerRange.js

@@ -81,7 +81,7 @@ var DatePickerRange = function (props) {
         setOpen(true);
     }, [setOpen]);
     var clear = useCallback(function () {
-        onChange([]);
+        onChange([], []);
         setStartRangeValue(undefined);
         setEndRangeValue(undefined);
     }, [onChange]);

package/ui/Blocks/CommonGrid/components/Filters/DatePickerRange/utils/pickerRangeToString.d.ts

@@ -1,2 +1,2 @@
 import type { DateTimeOthers } from '../../../../../../Elements/DatePicker/Datetime/types';
-export declare const pickerRangeToString: (values?: Date[], others?: DateTimeOthers) => string;
+export declare const pickerRangeToString: (values?: Date[], others?: DateTimeOthers[]) => string;

package/ui/Blocks/CommonGrid/components/Filters/DatePickerRange/utils/pickerRangeToString.js

@@ -3,12 +3,20 @@ import { DatePickerRepeatTrans, TimePickerRepeatTrans } from '../../../../../../
 import { sameDate } from './sameDate';
 // User readable date range.
 export var pickerRangeToString = function (values, others) {
+    var _a, _b;
     if (values === void 0) { values = []; }
-    if (others === null || others === void 0 ? void 0 : others.dateTypeRepeater) {
-        var repeaterDate = DatePickerRepeatTrans[others === null || others === void 0 ? void 0 : others.dateTypeRepeater];
-        var repeaterTime = (others === null || others === void 0 ? void 0 : others.timeTypeRepeater) ? TimePickerRepeatTrans[others === null || others === void 0 ? void 0 : others.timeTypeRepeater] : '';
-        var time = (others === null || others === void 0 ? void 0 : others.time) ? " ".concat(String(others === null || others === void 0 ? void 0 : others.time.h).padStart(2, '0'), ":").concat(String(others === null || others === void 0 ? void 0 : others.time.m).padStart(2, '0')) : '';
-        return "".concat(repeaterDate, " ").concat(repeaterTime).concat(time);
+    if (((_a = others === null || others === void 0 ? void 0 : others[0]) === null || _a === void 0 ? void 0 : _a.dateTypeRepeater) || ((_b = others === null || others === void 0 ? void 0 : others[1]) === null || _b === void 0 ? void 0 : _b.dateTypeRepeater)) {
+        return others
+            .map(function (other, i) {
+            if (!other)
+                return false;
+            var repeaterDate = DatePickerRepeatTrans[other === null || other === void 0 ? void 0 : other.dateTypeRepeater];
+            var repeaterTime = i === 0 ? TimePickerRepeatTrans.from : TimePickerRepeatTrans.to;
+            var time = (other === null || other === void 0 ? void 0 : other.time) ? "".concat(String(other === null || other === void 0 ? void 0 : other.time.h).padStart(2, '0'), ":").concat(String(other === null || other === void 0 ? void 0 : other.time.m).padStart(2, '0')) : '';
+            return "".concat(repeaterTime, " ").concat(repeaterDate, " ").concat(time).trim();
+        })
+            .filter(Boolean)
+            .join(' - ');
     }
     // If no date is specified
     if (!values[0] && !values[1]) {

package/ui/Elements/DatePicker/Datetime/components/DateRepeater.js

@@ -27,5 +27,5 @@ export var DateRepeater = function (_a) {
         }
         onChangeOthers === null || onChangeOthers === void 0 ? void 0 : onChangeOthers(__assign(__assign({}, others), { dateTypeRepeater: dateTypeRepeater }));
     }, [onChangeOthers, reset, others]);
-    return (_jsx(x.div, { borderTop: "1px solid", borderColor: "lightGray2", mt: "8px", pt: "8px", mb: "8px", children: _jsxs(FooterRow, { children: [_jsxs(x.div, { display: "flex", alignItems: "center", flex: "1", children: [_jsx(Icon, { icon: "calendar" }), _jsx(FooterRowLabel, { children: i18n._({ id: 'dataGrid.repeat', message: 'Repeat' }) })] }), _jsxs(x.select, { textAlign: "right", onChange: handleChange, value: others === null || others === void 0 ? void 0 : others.dateTypeRepeater, border: "none", children: [_jsx("option", { value: "", children: i18n._({ id: 'dataGrid.noRepeat', message: 'No repeat' }) }), _jsx("option", { value: DatePickerRepeat.EVERY_TODAY, children: DatePickerRepeatTrans[DatePickerRepeat.EVERY_TODAY] }), _jsx("option", { value: DatePickerRepeat.EVERY_YESTERDAY, children: DatePickerRepeatTrans[DatePickerRepeat.EVERY_YESTERDAY] }), _jsx("option", { value: DatePickerRepeat.EVERY_LAST_WEEK, children: DatePickerRepeatTrans[DatePickerRepeat.EVERY_LAST_WEEK] })] })] }) }));
+    return (_jsx(x.div, { borderTop: "1px solid", borderColor: "lightGray2", mt: "8px", pt: "8px", mb: "8px", children: _jsxs(FooterRow, { children: [_jsxs(x.div, { display: "flex", alignItems: "center", flex: "1", children: [_jsx(Icon, { icon: "calendar" }), _jsx(FooterRowLabel, { children: i18n._({ id: 'dataGrid.repeat', message: 'Repeat' }) })] }), _jsxs(x.select, { textAlign: "right", onChange: handleChange, value: others === null || others === void 0 ? void 0 : others.dateTypeRepeater, border: "none", children: [_jsx("option", { value: "", children: i18n._({ id: 'dataGrid.noRepeat', message: 'No repeat' }) }), _jsx("option", { value: DatePickerRepeat.EVERY_TODAY, children: DatePickerRepeatTrans[DatePickerRepeat.EVERY_TODAY] }), _jsx("option", { value: DatePickerRepeat.EVERY_YESTERDAY, children: DatePickerRepeatTrans[DatePickerRepeat.EVERY_YESTERDAY] })] })] }) }));
 };

package/ui/Elements/DatePicker/Datetime/components/Timepicker.js

@@ -29,14 +29,9 @@ export var Timepicker = function (_a) {
     var onChange = useCallback(function (e) {
         var value = e.target.value;
         var _a = value.split(':'), hours = _a[0], minutes = _a[1];
-        var defaultTimePickerType = isSecondDatePicker ? TimePickerRepeat.TO : TimePickerRepeat.FROM;
-        var timeTypeRepeater = (others === null || others === void 0 ? void 0 : others.dateTypeRepeater) ? (others === null || others === void 0 ? void 0 : others.timeTypeRepeater) || defaultTimePickerType : undefined;
         setHours(Number(hours));
         setMinutes(Number(minutes));
-        onChangeOthers === null || onChangeOthers === void 0 ? void 0 : onChangeOthers(__assign(__assign({}, others), { timeTypeRepeater: timeTypeRepeater, time: { h: Number(hours), m: Number(minutes) } }));
-    }, [onChangeOthers, others, isSecondDatePicker]);
-    var handleChangeTimer = useCallback(function (e) {
-        onChangeOthers === null || onChangeOthers === void 0 ? void 0 : onChangeOthers(__assign(__assign({}, others), { timeTypeRepeater: e.target.value }));
+        onChangeOthers === null || onChangeOthers === void 0 ? void 0 : onChangeOthers(__assign(__assign({}, others), { time: { h: Number(hours), m: Number(minutes) } }));
     }, [onChangeOthers, others]);
     useEffect(function () {
         !!value && setTime('hours', hours);
@@ -45,7 +40,5 @@ export var Timepicker = function (_a) {
         !!value && setTime('minutes', minutes);
     }, [minutes]);
     var timeValue = "".concat(hours.toString().padStart(2, '0'), ":").concat(minutes.toString().padStart(2, '0'));
-    var staticTimerValue = isSecondDatePicker ? TimePickerRepeat.TO : TimePickerRepeat.FROM;
-    var timeTypeRepeaterValue = (others === null || others === void 0 ? void 0 : others.dateTypeRepeater) ? others === null || others === void 0 ? void 0 : others.timeTypeRepeater : staticTimerValue;
-    return (_jsx(x.div, { borderTop: "1px solid", borderColor: "lightGray2", pt: "8px", mb: "8px", children: _jsxs(FooterRow, { disabled: disabled, children: [_jsxs(x.div, { children: [_jsx(Icon, { icon: "clock" }), _jsx(FooterRowLabel, { children: i18n._({ id: 'dataGrid.filterCell.time', message: 'Time' }) })] }), _jsxs(x.div, { display: "flex", alignItems: "center", children: [_jsxs(x.select, { onChange: handleChangeTimer, value: timeTypeRepeaterValue, textAlign: "right", disabled: disabled || !(others === null || others === void 0 ? void 0 : others.dateTypeRepeater), border: "none", children: [_jsx("option", { value: TimePickerRepeat.AT, children: TimePickerRepeatTrans[TimePickerRepeat.AT] }), isSecondDatePicker ? (_jsx("option", { value: TimePickerRepeat.TO, children: TimePickerRepeatTrans[TimePickerRepeat.TO] })) : (_jsx("option", { value: TimePickerRepeat.FROM, children: TimePickerRepeatTrans[TimePickerRepeat.FROM] }))] }), _jsx(TimeInput, { type: "time", onChange: onChange, disabled: disabled, value: timeValue })] })] }) }));
+    return (_jsx(x.div, { borderTop: "1px solid", borderColor: "lightGray2", pt: "8px", mb: "8px", children: _jsxs(FooterRow, { disabled: disabled, children: [_jsxs(x.div, { children: [_jsx(Icon, { icon: "clock" }), _jsx(FooterRowLabel, { children: i18n._({ id: 'dataGrid.filterCell.time', message: 'Time' }) })] }), _jsxs(x.div, { display: "flex", alignItems: "center", children: [_jsxs("b", { children: [isSecondDatePicker ? TimePickerRepeatTrans[TimePickerRepeat.TO] : TimePickerRepeatTrans[TimePickerRepeat.FROM], ":", ' '] }), _jsx(TimeInput, { type: "time", onChange: onChange, disabled: disabled, value: timeValue })] })] }) }));
 };

package/ui/Elements/DatePicker/Datetime/types.d.ts

@@ -61,7 +61,6 @@ export interface DatetimepickerState {
 }
 export type DateTimeOthers = {
     dateTypeRepeater: DatePickerRepeat;
-    timeTypeRepeater?: TimePickerRepeat;
     time?: {
         h: number;
         m: number;
@@ -69,8 +68,7 @@ export type DateTimeOthers = {
 };
 export declare enum DatePickerRepeat {
     EVERY_TODAY = "every-today",
-    EVERY_YESTERDAY = "every-yesterday",
-    EVERY_LAST_WEEK = "every-last-week"
+    EVERY_YESTERDAY = "every-yesterday"
 }
 export declare enum TimePickerRepeat {
     FROM = "from",

package/ui/Elements/DatePicker/Datetime/types.js

@@ -2,7 +2,6 @@ export var DatePickerRepeat;
 (function (DatePickerRepeat) {
     DatePickerRepeat["EVERY_TODAY"] = "every-today";
     DatePickerRepeat["EVERY_YESTERDAY"] = "every-yesterday";
-    DatePickerRepeat["EVERY_LAST_WEEK"] = "every-last-week";
 })(DatePickerRepeat || (DatePickerRepeat = {}));
 export var TimePickerRepeat;
 (function (TimePickerRepeat) {

package/ui/Elements/DatePicker/Datetime/views/DaysView.js

@@ -123,7 +123,6 @@ var DaysView = /** @class */ (function (_super) {
         var value = this.props.value;
         var others = this.props.others;
         var disabled = this.props.disabled;
-        console.log('foooter: ', others);
         return (_jsx("tfoot", { children: _jsx("tr", { children: _jsxs("td", { colSpan: 7, children: [onChangeOthers && _jsx(DateRepeater, { onChangeOthers: onChangeOthers, others: others, reset: reset }), this.props.timeFormat && (_jsx(Timepicker, { setTime: setTime, value: value, disabled: disabled || (!value && !(others === null || others === void 0 ? void 0 : others.dateTypeRepeater)), others: others, onChangeOthers: onChangeOthers, isSecondDatePicker: this.props.isSecondDatePicker }))] }) }) }));
     };
     DaysView.defaultProps = {

package/ui/Elements/DatePicker/utils/constants.js

@@ -4,7 +4,6 @@ import { i18n } from '@lingui/core';
 export var DatePickerRepeatTrans = (_a = {},
     _a[DatePickerRepeat.EVERY_TODAY] = i18n._({ id: 'dataGrid.everyToday', message: 'Every today' }),
     _a[DatePickerRepeat.EVERY_YESTERDAY] = i18n._({ id: 'dataGrid.everyYesterday', message: 'Every yesterday' }),
-    _a[DatePickerRepeat.EVERY_LAST_WEEK] = i18n._({ id: 'dataGrid.everyLastWeek', message: 'Every last week' }),
     _a);
 export var TimePickerRepeatTrans = (_b = {},
     _b[TimePickerRepeat.FROM] = i18n._({ id: 'dataGrid.timepicker.from', message: 'from' }),