@hipay/hipay-material-ui 3.4.0 → 3.4.2

package/HiDatePicker/HiDateRangeSelector.js

@@ -378,8 +378,8 @@ function (_React$Component) {
       });
 
       if (selectedOption) {
-        this.props.onChange('from', new Date(selectedOption.from.format('YYYY-MM-DD HH:mm:ss')));
-        this.props.onChange('to', new Date(selectedOption.to.format('YYYY-MM-DD HH:mm:ss')));
+        this.props.onChange('from', selectedOption.from.toDate());
+        this.props.onChange('to', selectedOption.to.toDate());
         this.props.onChange('fromError', false);
         this.props.onChange('toError', false);
       }

package/HiSelect/HiSelect.js

@@ -9,10 +9,12 @@ exports.default = exports.styles = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
@@ -206,13 +208,24 @@ function (_React$PureComponent) {
         if (item === undefined) {
           inputValue = translations.one_item_selected;
         } else if (type === 'icon' || item.type === 'icon') {
+          var iconProps = {
+            className: classes.labelIcon,
+            color: item.color
+          };
+          var icon;
+
+          if (typeof item.icon === 'string') {
+            icon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
+              icon: item.icon
+            }, iconProps));
+          } else if ((0, _typeof2.default)(item.icon) === 'object') {
+            icon = (0, _objectSpread2.default)({}, item.icon);
+            icon.props = (0, _objectSpread2.default)({}, icon.props, {}, iconProps);
+          }
+
           inputValue = _react.default.createElement("span", {
             className: classes.selectIconLabel
-          }, _react.default.createElement(_HiIcon.default, {
-            className: classes.labelIcon,
-            color: item.color,
-            icon: item.icon
-          }), item.label);
+          }, icon, item.label);
         } else if (type === 'image' || item.type === 'image') {
           inputValue = _react.default.createElement("span", {
             className: classes.selectIconLabel

package/es/HiDatePicker/HiDateRangeSelector.js

@@ -378,8 +378,8 @@ function (_React$Component) {
       });
 
       if (selectedOption) {
-        this.props.onChange('from', new Date(selectedOption.from.format('YYYY-MM-DD HH:mm:ss')));
-        this.props.onChange('to', new Date(selectedOption.to.format('YYYY-MM-DD HH:mm:ss')));
+        this.props.onChange('from', selectedOption.from.toDate());
+        this.props.onChange('to', selectedOption.to.toDate());
         this.props.onChange('fromError', false);
         this.props.onChange('toError', false);
       }

package/es/HiSelect/HiSelect.js

@@ -9,10 +9,12 @@ exports.default = exports.styles = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
@@ -206,13 +208,24 @@ function (_React$PureComponent) {
         if (item === undefined) {
           inputValue = translations.one_item_selected;
         } else if (type === 'icon' || item.type === 'icon') {
+          var iconProps = {
+            className: classes.labelIcon,
+            color: item.color
+          };
+          var icon;
+
+          if (typeof item.icon === 'string') {
+            icon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
+              icon: item.icon
+            }, iconProps));
+          } else if ((0, _typeof2.default)(item.icon) === 'object') {
+            icon = (0, _objectSpread2.default)({}, item.icon);
+            icon.props = (0, _objectSpread2.default)({}, icon.props, {}, iconProps);
+          }
+
           inputValue = _react.default.createElement("span", {
             className: classes.selectIconLabel
-          }, _react.default.createElement(_HiIcon.default, {
-            className: classes.labelIcon,
-            color: item.color,
-            icon: item.icon
-          }), item.label);
+          }, icon, item.label);
         } else if (type === 'image' || item.type === 'image') {
           inputValue = _react.default.createElement("span", {
             className: classes.selectIconLabel

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hipay/hipay-material-ui",
   "private": false,
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "React components that implement Google's Material Design.",
   "repository": {
     "type": "git",
@@ -68,4 +68,4 @@
   },
   "main": "./index.js",
   "module": "./esm/index.js"
-}
+}