@steroidsjs/core 2.2.0 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {

package/ui/content/Calendar/Calendar.js

@@ -31,7 +31,7 @@ function Calendar(props) {
             setMonth(selectedDates[0]);
         }
     }, [selectedDates]);
-    var onDaySelect = react_1.useCallback(function (date) { return props.onChange.call(null, calendar_1.convertDate(date, null, props.valueFormat)); }, [props.onChange, props.valueFormat]);
+    var onDaySelect = react_1.useCallback(function (date) { return props.onChange.call(null, calendar_1.convertDate(date, null, props.valueFormat, false, true)); }, [props.onChange, props.valueFormat]);
     var toggleCaptionPanel = react_1.useCallback(function () {
         setIsCaptionPanelVisible(!isCaptionPanelVisible);
     }, [isCaptionPanelVisible]);

package/ui/form/DateField/useDateInputState.js

@@ -21,9 +21,9 @@ var calendar_1 = require("../../../utils/calendar");
 function useDateInputState(props) {
     // Get props value
     var propsDisplayValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [
-        props.displayFormat,
         props.valueFormat,
-    ], props.displayFormat) || ''; }, [props.displayFormat, props.input.value, props.valueFormat]);
+        props.displayFormat,
+    ], props.displayFormat, false, true) || ''; }, [props.displayFormat, props.input.value, props.valueFormat]);
     // Display value state
     var _a = react_1.useState(propsDisplayValue), displayValue = _a[0], setDisplayValue = _a[1];
     // Update display value on update props input value
@@ -40,15 +40,15 @@ function useDateInputState(props) {
     // Display input change handler
     var onDisplayValueChange = react_1.useCallback(function (value) {
         setDisplayValue(value);
-        var parsedValue = calendar_1.convertDate(value, props.displayFormat, props.valueFormat, props.useUTC);
+        var parsedValue = calendar_1.convertDate(value, props.displayFormat, props.valueFormat, true);
         var newValue = parsedValue || !value ? parsedValue || null : false;
-        if (newValue !== false && newValue !== props.input.value) {
+        if (newValue && newValue !== props.input.value) {
             props.input.onChange.call(null, newValue);
             if (props.onChange) {
                 props.onChange.call(null, value);
             }
         }
-    }, [props.displayFormat, props.input.onChange, props.input.value, props.onChange, props.useUTC, props.valueFormat]);
+    }, [props.displayFormat, props.input.onChange, props.input.value, props.onChange, props.valueFormat]);
     // Dropdown opened state
     var _b = react_1.useState(false), isOpened = _b[0], setIsOpened = _b[1];
     // Focus/blur handlers
@@ -56,10 +56,11 @@ function useDateInputState(props) {
         e.preventDefault();
         setIsOpened(true);
     }, [setIsOpened]);
-    var onBlur = react_1.useCallback(function (e) {
-        e.preventDefault();
-        //setIsOpened(false);
-    }, []);
+    var onBlur = react_1.useCallback(function () {
+        if (propsDisplayValue !== displayValue) {
+            setDisplayValue(propsDisplayValue);
+        }
+    }, [displayValue, propsDisplayValue]);
     var onClose = react_1.useCallback(function () {
         setIsOpened(false);
         if (propsDisplayValue !== displayValue) {

package/ui/form/DateField/useDateTime.js

@@ -13,8 +13,8 @@ var calendar_1 = require("../../../utils/calendar");
  */
 function useDateTime(props) {
     var _a = props.valueFormat.split(props.dateTimeSeparator), dateValueFormat = _a[0], timeValueFormat = _a[1];
-    var dateValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.displayFormat, props.valueFormat], dateValueFormat); }, [dateValueFormat, props.displayFormat, props.input.value, props.valueFormat]);
-    var timeValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.displayFormat, props.valueFormat], timeValueFormat); }, [props.displayFormat, props.input.value, props.valueFormat, timeValueFormat]);
+    var dateValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.valueFormat, props.displayFormat], dateValueFormat, false, true); }, [dateValueFormat, props.displayFormat, props.input.value, props.valueFormat]);
+    var timeValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.displayFormat, props.valueFormat], timeValueFormat, false, true); }, [props.displayFormat, props.input.value, props.valueFormat, timeValueFormat]);
     // Handler for calendar and time picker changes
     var onDateSelect = react_1.useCallback(function (date) {
         var result = date + props.dateTimeSeparator + (timeValue || '00:00');

package/utils/calendar.d.ts

@@ -1,4 +1,4 @@
-export declare const convertDate: (date: string | Date, fromFormats: string | string[], toFormat?: string, utc?: boolean) => any;
+export declare const convertDate: (date: string | Date, fromFormats: string | string[], toFormat?: string, utc?: boolean, dateInUtc?: boolean) => any;
 /**
  * Регулярка проверяет соответствие введенной строки формату 'hh:mm'
  * Максимальная величина - 23:59

package/utils/calendar.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.convertDate = void 0;
 var moment_1 = __importDefault(require("moment"));
-var convertDate = function (date, fromFormats, toFormat, utc) {
+var convertDate = function (date, fromFormats, toFormat, utc, dateInUtc) {
     if (toFormat === void 0) { toFormat = null; }
     if (utc === void 0) { utc = false; }
+    if (dateInUtc === void 0) { dateInUtc = false; }
     if (!date) {
         return null;
     }
@@ -19,7 +20,12 @@ var convertDate = function (date, fromFormats, toFormat, utc) {
         if (!validFormat) {
             return null;
         }
-        momentDate = moment_1["default"](date, validFormat);
+        if (dateInUtc) {
+            momentDate = moment_1["default"].utc(date, validFormat);
+        }
+        else {
+            momentDate = moment_1["default"](date, validFormat);
+        }
     }
     else if (date instanceof Date) {
         momentDate = moment_1["default"](date);
@@ -31,7 +37,7 @@ var convertDate = function (date, fromFormats, toFormat, utc) {
         momentDate = momentDate.utc();
     }
     else {
-        momentDate = momentDate.utc(true).local();
+        momentDate = momentDate.local();
     }
     return toFormat ? momentDate.format(toFormat) : momentDate.toDate();
 };