@steroidsjs/core 3.0.0-beta.89 → 3.0.0-beta.90
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/package.json
CHANGED
|
@@ -47,11 +47,7 @@ function DateTimeField(props) {
|
|
|
47
47
|
dateInUTC: props.dateInUTC
|
|
48
48
|
}), dateValueFormat = _b.dateValueFormat, dateValue = _b.dateValue, timeValue = _b.timeValue, onDateSelect = _b.onDateSelect, onTimeSelect = _b.onTimeSelect;
|
|
49
49
|
// Calendar props
|
|
50
|
-
var calendarProps = (0, react_1.useMemo)(function () { return ({
|
|
51
|
-
value: dateValue,
|
|
52
|
-
onChange: onDateSelect,
|
|
53
|
-
valueFormat: dateValueFormat
|
|
54
|
-
}); }, [dateValue, dateValueFormat, onDateSelect]);
|
|
50
|
+
var calendarProps = (0, react_1.useMemo)(function () { return (__assign({ value: dateValue, onChange: onDateSelect, valueFormat: dateValueFormat }, props.calendarProps)); }, [dateValue, dateValueFormat, onDateSelect, props.calendarProps]);
|
|
55
51
|
// TimePanel props
|
|
56
52
|
var timePanelViewProps = (0, react_1.useMemo)(function () { return ({
|
|
57
53
|
onClose: onClose,
|
|
@@ -68,7 +64,7 @@ DateTimeField.defaultProps = {
|
|
|
68
64
|
className: '',
|
|
69
65
|
displayFormat: 'DD.MM.YYYY' + DATE_TIME_SEPARATOR + 'HH:mm',
|
|
70
66
|
valueFormat: 'YYYY-MM-DD' + DATE_TIME_SEPARATOR + 'HH:mm',
|
|
71
|
-
useUTC:
|
|
67
|
+
useUTC: false,
|
|
72
68
|
dateInUTC: false,
|
|
73
69
|
size: 'md',
|
|
74
70
|
icon: true
|
|
@@ -42,6 +42,8 @@ function DateTimeRangeField(props) {
|
|
|
42
42
|
placeholder: props.placeholder,
|
|
43
43
|
required: props.required,
|
|
44
44
|
inputProps: props.inputPropsFrom,
|
|
45
|
+
useUTC: props.useUTC,
|
|
46
|
+
dateInUTC: props.dateInUTC,
|
|
45
47
|
onChange: onChange
|
|
46
48
|
}), isOpenedFrom = _a.isOpened, onCloseFrom = _a.onClose, inputPropsFrom = _a.inputProps, onClearFrom = _a.onClear, onNow = _a.onNow;
|
|
47
49
|
// Input 'to'
|
|
@@ -53,18 +55,24 @@ function DateTimeRangeField(props) {
|
|
|
53
55
|
placeholder: props.placeholder,
|
|
54
56
|
required: props.required,
|
|
55
57
|
inputProps: props.inputPropsTo,
|
|
58
|
+
useUTC: props.useUTC,
|
|
59
|
+
dateInUTC: props.dateInUTC,
|
|
56
60
|
onChange: onChange
|
|
57
61
|
}), isOpenedTo = _b.isOpened, onCloseTo = _b.onClose, inputPropsTo = _b.inputProps, onClearTo = _b.onClear;
|
|
58
62
|
var _c = (0, useDateTime_1["default"])({
|
|
59
63
|
displayFormat: props.displayFormat,
|
|
60
64
|
valueFormat: props.valueFormat,
|
|
61
65
|
dateTimeSeparator: DATE_TIME_SEPARATOR,
|
|
66
|
+
useUTC: props.useUTC,
|
|
67
|
+
dateInUTC: props.dateInUTC,
|
|
62
68
|
input: props.inputFrom
|
|
63
69
|
}), dateValueFormat = _c.dateValueFormat, dateValueFrom = _c.dateValue, timeValueFrom = _c.timeValue, onDateFromSelect = _c.onDateSelect, onTimeFromSelect = _c.onTimeSelect;
|
|
64
70
|
var _d = (0, useDateTime_1["default"])({
|
|
65
71
|
displayFormat: props.displayFormat,
|
|
66
72
|
valueFormat: props.valueFormat,
|
|
67
73
|
dateTimeSeparator: DATE_TIME_SEPARATOR,
|
|
74
|
+
useUTC: props.useUTC,
|
|
75
|
+
dateInUTC: props.dateInUTC,
|
|
68
76
|
input: props.inputTo
|
|
69
77
|
}), dateValueTo = _d.dateValue, timeValueTo = _d.timeValue, onDateToSelect = _d.onDateSelect, onTimeToSelect = _d.onTimeSelect;
|
|
70
78
|
var _e = (0, useDateRange_1["default"])({
|
|
@@ -102,6 +110,8 @@ DateTimeRangeField.defaultProps = {
|
|
|
102
110
|
displayFormat: 'DD.MM.YYYY' + DATE_TIME_SEPARATOR + 'HH:mm',
|
|
103
111
|
valueFormat: 'YYYY-MM-DD' + DATE_TIME_SEPARATOR + 'HH:mm',
|
|
104
112
|
showRemove: true,
|
|
113
|
+
useUTC: false,
|
|
114
|
+
dateInUTC: false,
|
|
105
115
|
icon: true,
|
|
106
116
|
size: 'md'
|
|
107
117
|
};
|
package/ui/nav/Router/Router.js
CHANGED
|
@@ -81,18 +81,17 @@ var renderComponent = function (route, activePath, routeProps) {
|
|
|
81
81
|
};
|
|
82
82
|
function Router(props) {
|
|
83
83
|
var components = (0, hooks_1.useComponents)();
|
|
84
|
-
var
|
|
84
|
+
var routeParams = (0, hooks_1.useSelector)(router_2.getRouteParams);
|
|
85
85
|
var _a = (0, hooks_1.useSelector)(function (state) {
|
|
86
|
-
var _a, _b
|
|
86
|
+
var _a, _b;
|
|
87
87
|
return ({
|
|
88
88
|
isInitialized: (0, router_2.isRouterInitialized)(state),
|
|
89
89
|
pathname: (0, get_1["default"])(state, 'router.location.pathname'),
|
|
90
90
|
route: (0, router_2.getRoute)(state),
|
|
91
|
-
|
|
92
|
-
activePath: (_c = (_b = state.router) === null || _b === void 0 ? void 0 : _b.location) === null || _c === void 0 ? void 0 : _c.pathname,
|
|
91
|
+
activePath: (_b = (_a = state.router) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.pathname,
|
|
93
92
|
activeRouteIds: (0, router_2.getActiveRouteIds)(state)
|
|
94
93
|
});
|
|
95
|
-
}), isInitialized = _a.isInitialized, pathname = _a.pathname, route = _a.route,
|
|
94
|
+
}), isInitialized = _a.isInitialized, pathname = _a.pathname, route = _a.route, activePath = _a.activePath, activeRouteIds = _a.activeRouteIds;
|
|
96
95
|
var routeId = (route === null || route === void 0 ? void 0 : route.id) || null;
|
|
97
96
|
// Init routes in redux
|
|
98
97
|
var dispatch = (0, useDispatch_1["default"])();
|
|
@@ -102,10 +101,9 @@ function Router(props) {
|
|
|
102
101
|
}
|
|
103
102
|
});
|
|
104
103
|
// Sync route params with redux
|
|
105
|
-
var prevRouteParams = (0, react_use_1.
|
|
104
|
+
var prevRouteParams = (0, react_use_1.usePreviousDistinct)(routeParams);
|
|
106
105
|
(0, react_1.useEffect)(function () {
|
|
107
106
|
if (!(0, isEqual_1["default"])(prevRouteParams, routeParams)) {
|
|
108
|
-
rememberedPrevRouterParamsRef.current = prevRouteParams;
|
|
109
107
|
dispatch((0, router_1.initParams)(routeParams));
|
|
110
108
|
}
|
|
111
109
|
}, [dispatch, prevRouteParams, routeParams]);
|
|
@@ -156,7 +154,7 @@ function Router(props) {
|
|
|
156
154
|
return activeRoute && activeRoute.role !== exports.ROUTER_ROLE_MODAL;
|
|
157
155
|
});
|
|
158
156
|
if (parentRouteId) {
|
|
159
|
-
dispatch((0, router_1.goToRoute)(parentRouteId,
|
|
157
|
+
dispatch((0, router_1.goToRoute)(parentRouteId, prevRouteParams));
|
|
160
158
|
}
|
|
161
159
|
}
|
|
162
160
|
});
|