@hipay/hipay-material-ui 2.0.0-beta.63 → 2.0.0-beta.65

package/HiCell/CellRate.js

@@ -40,7 +40,7 @@ var styles = function styles(theme) {
       overflow: 'hidden',
       position: 'relative',
       textAlign: 'right',
-      paddingTop: '1em'
+      paddingTop: 10
     },
     trendChipIcon: {
       width: 14,

package/HiForm/HiUpload.js

@@ -356,14 +356,12 @@ function (_React$PureComponent) {
       return _react.default.createElement("div", {
         className: classes.flexContainer
       }, _react.default.createElement("label", {
-        htmlFor: "flat-button-file",
         ref: function ref(label) {
           _this2.uploadFieldRef = label;
         },
         tabIndex: "-1"
       }, _react.default.createElement("input", {
         hidden: true,
-        id: "flat-button-file",
         type: !complete || values.length === 1 ? 'file' : 'hidden',
         onChange: this.handleChange,
         onClick: focusable ? this.handleEmptyField : undefined,

package/HiSelect/HiDynamicSelect.js

@@ -80,7 +80,7 @@ function (_React$PureComponent) {
           return id !== item.id;
         }), item);
       } else {
-        onChange(event, [].concat((0, _toConsumableArray2.default)(value), [item.id]), item);
+        onChange(event, (0, _toConsumableArray2.default)(value).concat([item.id]), item);
       }
     };
 
@@ -91,14 +91,14 @@ function (_React$PureComponent) {
       var _this$props2 = _this.props,
           nextPage = _this$props2.nextPage,
           translations = _this$props2.translations;
-      var itemList = [].concat((0, _toConsumableArray2.default)(options.length === 0 && !loading ? [{
+      var itemList = (0, _toConsumableArray2.default)(options.length === 0 && !loading ? [{
         id: '_no_result',
         type: 'text',
         disabled: true,
         centered: true,
         hideCheckbox: true,
         label: translations.no_result_match
-      }] : []), (0, _toConsumableArray2.default)(options), (0, _toConsumableArray2.default)(!loading && nextPage === 'manual' ? [{
+      }] : []).concat((0, _toConsumableArray2.default)(options), (0, _toConsumableArray2.default)(!loading && nextPage === 'manual' ? [{
         id: '_next_page',
         type: 'button',
         centered: true,
@@ -135,9 +135,7 @@ function (_React$PureComponent) {
           other = (0, _objectWithoutProperties2.default)(_this$props3, ["hiSelectableListProps", "multiple", "nextPage", "options", "translations", "value"]);
       return _react.default.createElement(_HiSelect.default, (0, _extends2.default)({
         buildSelectProps: this.buildSelectProps,
-        hiSelectableListProps: (0, _extends2.default)({
-          onSelect: this.handleSelect
-        }, hiSelectableListProps),
+        hiSelectableListProps: (0, _extends2.default)({}, hiSelectableListProps),
         multiple: multiple,
         options: options,
         searchable: true,

package/HiSelect/HiNestedSelect.js

@@ -47,12 +47,12 @@ var _helpers = require("../utils/helpers");
  */
 function getRecursiveFinalItemIdList(itemList) {
   var finalItemIdList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return [].concat((0, _toConsumableArray2.default)(finalItemIdList), (0, _toConsumableArray2.default)(itemList.reduce(function (memo, item) {
+  return (0, _toConsumableArray2.default)(finalItemIdList).concat((0, _toConsumableArray2.default)(itemList.reduce(function (memo, item) {
     if (item.children) {
       return getRecursiveFinalItemIdList(item.children, memo);
     }
 
-    return [].concat((0, _toConsumableArray2.default)(memo), [item.id]);
+    return (0, _toConsumableArray2.default)(memo).concat([item.id]);
   }, [])));
 }
 /**
@@ -128,7 +128,7 @@ function buildFilteredItemList(itemList) {
       }
 
       return {
-        l: [].concat((0, _toConsumableArray2.default)(memoItemList), [(0, _extends2.default)({}, item, disabledParent && {
+        l: (0, _toConsumableArray2.default)(memoItemList).concat([(0, _extends2.default)({}, item, disabledParent && {
           disabled: true,
           hideCheckbox: true // don't display checkbox on disabled parent
 
@@ -147,7 +147,7 @@ function buildFilteredItemList(itemList) {
 
     var itemSelected = selectedItemIdList.includes(item.id);
     return {
-      l: [].concat((0, _toConsumableArray2.default)(memoItemList), [(0, _extends2.default)({
+      l: (0, _toConsumableArray2.default)(memoItemList).concat([(0, _extends2.default)({
         displayed: itemVisible || visibleParent
       }, item)]),
       s: itemSelected && memoSelected,
@@ -266,9 +266,9 @@ function (_React$PureComponent) {
           }), item);
         } else {
           // select parent > add each selectable child without duplicates.
-          onChange(event, [].concat((0, _toConsumableArray2.default)(value.filter(function (vid) {
+          onChange(event, (0, _toConsumableArray2.default)(value.filter(function (vid) {
             return !parentSelectableItemIdList.includes(vid);
-          })), (0, _toConsumableArray2.default)(parentSelectableItemIdList)), item);
+          })).concat((0, _toConsumableArray2.default)(parentSelectableItemIdList)), item);
         }
       } else if (value.includes(item.id)) {
         // unselect item
@@ -276,7 +276,7 @@ function (_React$PureComponent) {
           return id !== item.id;
         }), item);
       } else {
-        onChange(event, [].concat((0, _toConsumableArray2.default)(value), [item.id]), item);
+        onChange(event, (0, _toConsumableArray2.default)(value).concat([item.id]), item);
       }
     };
 
@@ -315,14 +315,14 @@ function (_React$PureComponent) {
         centered: true,
         hideCheckbox: true,
         label: translations.no_result_match
-      }]) : [].concat((0, _toConsumableArray2.default)(loading ? [{
+      }]) : (0, _toConsumableArray2.default)(loading ? [{
         id: '_loading',
         type: 'loader',
         disabled: true,
         centered: true,
         hideCheckbox: true,
         label: 'loading'
-      }] : []), (0, _toConsumableArray2.default)(hasAll ? [{
+      }] : []).concat((0, _toConsumableArray2.default)(hasAll ? [{
         id: '_all',
         iconAll: iconAll,
         label: translations.all,

package/HiSelect/HiNestedSelectContent.js

@@ -43,12 +43,12 @@ var _helpers = require("../utils/helpers");
  */
 function getRecursiveFinalItemIdList(itemList) {
   var finalItemIdList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return [].concat((0, _toConsumableArray2.default)(finalItemIdList), (0, _toConsumableArray2.default)(itemList.reduce(function (memo, item) {
+  return (0, _toConsumableArray2.default)(finalItemIdList).concat((0, _toConsumableArray2.default)(itemList.reduce(function (memo, item) {
     if (item.children) {
       return getRecursiveFinalItemIdList(item.children, memo);
     }
 
-    return [].concat((0, _toConsumableArray2.default)(memo), [item.id]);
+    return (0, _toConsumableArray2.default)(memo).concat([item.id]);
   }, [])));
 }
 /**
@@ -124,7 +124,7 @@ function buildFilteredItemList(itemList) {
       }
 
       return {
-        l: [].concat((0, _toConsumableArray2.default)(memoItemList), [(0, _extends2.default)({}, item, disabledParent && {
+        l: (0, _toConsumableArray2.default)(memoItemList).concat([(0, _extends2.default)({}, item, disabledParent && {
           disabled: true,
           hideCheckbox: true // don't display checkbox on disabled parent
 
@@ -143,7 +143,7 @@ function buildFilteredItemList(itemList) {
 
     var itemSelected = selectedItemIdList.includes(item.id);
     return {
-      l: [].concat((0, _toConsumableArray2.default)(memoItemList), [(0, _extends2.default)({
+      l: (0, _toConsumableArray2.default)(memoItemList).concat([(0, _extends2.default)({
         displayed: itemVisible || visibleParent
       }, item)]),
       s: itemSelected && memoSelected,
@@ -223,9 +223,9 @@ function (_React$PureComponent) {
           }), item);
         } else {
           // select parent > add each selectable child without duplicates.
-          onChange(event, [].concat((0, _toConsumableArray2.default)(value.filter(function (vid) {
+          onChange(event, (0, _toConsumableArray2.default)(value.filter(function (vid) {
             return !parentSelectableItemIdList.includes(vid);
-          })), (0, _toConsumableArray2.default)(parentSelectableItemIdList)), item);
+          })).concat((0, _toConsumableArray2.default)(parentSelectableItemIdList)), item);
         }
       } else if (value.includes(item.id)) {
         // unselect item
@@ -233,7 +233,7 @@ function (_React$PureComponent) {
           return id !== item.id;
         }), item);
       } else {
-        onChange(event, [].concat((0, _toConsumableArray2.default)(value), [item.id]), item);
+        onChange(event, (0, _toConsumableArray2.default)(value).concat([item.id]), item);
       }
     };
 
@@ -271,14 +271,14 @@ function (_React$PureComponent) {
         centered: true,
         hideCheckbox: true,
         label: translations.no_result_match
-      }]) : [].concat((0, _toConsumableArray2.default)(loading ? [{
+      }]) : (0, _toConsumableArray2.default)(loading ? [{
         id: '_loading',
         type: 'loader',
         disabled: true,
         centered: true,
         hideCheckbox: true,
         label: 'loading'
-      }] : []), (0, _toConsumableArray2.default)(hasAll ? [{
+      }] : []).concat((0, _toConsumableArray2.default)(hasAll ? [{
         id: '_all',
         iconAll: iconAll,
         label: translations.all,

package/HiSelect/HiSelect.js

@@ -149,22 +149,22 @@ function (_React$PureComponent) {
       var search = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
       var loading = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       // build item list
-      var itemList = [].concat((0, _toConsumableArray2.default)(loading ? [{
+      var itemList = (0, _toConsumableArray2.default)(loading ? [{
         id: '_loading',
         type: 'loader',
         disabled: true,
         centered: true,
         hideCheckbox: true,
         label: 'loading'
-      }] : []), (0, _toConsumableArray2.default)(search !== '' ? (0, _toConsumableArray2.default)(options.filter(function (item) {
+      }] : []).concat((0, _toConsumableArray2.default)(search !== '' ? (0, _toConsumableArray2.default)(options.filter(function (item) {
         return _this.props.filterFunc(item, search);
-      })) : [].concat((0, _toConsumableArray2.default)(_this.props.hasAll ? [(0, _extends2.default)({
+      })) : (0, _toConsumableArray2.default)(_this.props.hasAll ? [(0, _extends2.default)({
         id: '_all',
         label: _this.props.translations.all
       }, _this.props.iconAll && {
         type: 'icon',
         icon: _this.props.iconAll
-      })] : []), (0, _toConsumableArray2.default)(options))));
+      })] : []).concat((0, _toConsumableArray2.default)(options))));
       return {
         itemList: itemList,
         inputValue: _this.buildInputValue(options, value, loading)
@@ -420,7 +420,7 @@ function (_React$PureComponent) {
           return id !== item.id;
         }), item);
       } else {
-        onChange(event, [].concat((0, _toConsumableArray2.default)(value), [item.id]), item);
+        onChange(event, (0, _toConsumableArray2.default)(value).concat([item.id]), item);
       }
     };
 
@@ -446,13 +446,13 @@ function (_React$PureComponent) {
         });
       } else {
         _this.setState({
-          suggestions: [].concat((0, _toConsumableArray2.default)(hasAll ? [(0, _extends2.default)({
+          suggestions: (0, _toConsumableArray2.default)(hasAll ? [(0, _extends2.default)({
             id: '_all',
             label: translations.all
           }, iconAll && {
             type: 'icon',
             icon: iconAll
-          })] : []), (0, _toConsumableArray2.default)(suggestions))
+          })] : []).concat((0, _toConsumableArray2.default)(suggestions))
         });
       }
     };

package/HiSelect/HiSelectContent.js

@@ -179,7 +179,7 @@ function (_React$PureComponent) {
           return id !== item.id;
         }), item);
       } else {
-        onChange(event, [].concat((0, _toConsumableArray2.default)(value), [item.id]), item);
+        onChange(event, (0, _toConsumableArray2.default)(value).concat([item.id]), item);
       }
     };
 
@@ -209,13 +209,13 @@ function (_React$PureComponent) {
         });
       } else {
         _this.setState({
-          suggestions: [].concat((0, _toConsumableArray2.default)(hasAll ? [(0, _extends2.default)({
+          suggestions: (0, _toConsumableArray2.default)(hasAll ? [(0, _extends2.default)({
             id: '_all',
             label: translations.all
           }, iconAll && {
             type: 'icon',
             icon: iconAll
-          })] : []), (0, _toConsumableArray2.default)(suggestions))
+          })] : []).concat((0, _toConsumableArray2.default)(suggestions))
         });
       }
     };
@@ -251,22 +251,22 @@ function (_React$PureComponent) {
       var search = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
       var loading = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       // build item list
-      var itemList = [].concat((0, _toConsumableArray2.default)(loading ? [{
+      var itemList = (0, _toConsumableArray2.default)(loading ? [{
         id: '_loading',
         type: 'loader',
         disabled: true,
         centered: true,
         hideCheckbox: true,
         label: 'loading'
-      }] : []), (0, _toConsumableArray2.default)(search !== '' ? (0, _toConsumableArray2.default)(options.filter(function (item) {
+      }] : []).concat((0, _toConsumableArray2.default)(search !== '' ? (0, _toConsumableArray2.default)(options.filter(function (item) {
         return item.label && _this.props.filterFunc(item, search);
-      })) : [].concat((0, _toConsumableArray2.default)(_this.props.hasAll ? [(0, _extends2.default)({
+      })) : (0, _toConsumableArray2.default)(_this.props.hasAll ? [(0, _extends2.default)({
         id: '_all',
         label: _this.props.translations.all
       }, _this.props.iconAll && {
         type: 'icon',
         icon: _this.props.iconAll
-      })] : []), (0, _toConsumableArray2.default)(options))));
+      })] : []).concat((0, _toConsumableArray2.default)(options))));
       return {
         itemList: itemList
       };

package/HiSelectableList/HiSelectableList.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.styles = void 0;
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -163,16 +161,32 @@ function (_React$PureComponent) {
   (0, _createClass2.default)(HiSelectableList, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      var _this2 = this;
+
+      // Focus on last item selected
       if (this.props.overlay && this.props.overlay.getElementsByTagName('li')[0]) {
         var item = this.props.overlay.getElementsByTagName('li')[0];
-        var value = this.props.value && (0, _typeof2.default)(this.props.value) === 'object' ? this.props.value[0] : this.props.value;
-
-        if (value) {
-          if (typeof this.props.value[0] === 'string') {
-            item = this.props.overlay.getElementsByTagName('li')[value];
-          } else if (typeof this.props.value[0] === 'number') {
-            item = this.props.overlay.getElementsByTagName('li')[value - 1];
-          }
+
+        if (this.props.value) {
+          var lastSelectedValue = Array.isArray(this.props.value) ? this.props.value[this.props.value.length - 1] : this.props.value;
+          var index = 0;
+          this.props.itemList.forEach(function (option) {
+            if (option.id === lastSelectedValue) {
+              item = _this2.props.overlay.getElementsByTagName('li')[index];
+            }
+
+            index++;
+
+            if (option.children && option.children.length) {
+              option.children.forEach(function (option) {
+                if (option.id === lastSelectedValue) {
+                  item = _this2.props.overlay.getElementsByTagName('li')[index];
+                }
+
+                index++;
+              });
+            }
+          });
         }
 
         item.focus();
@@ -181,7 +195,7 @@ function (_React$PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
+      var _this3 = this;
 
       var _this$props2 = this.props,
           classes = _this$props2.classes,
@@ -196,13 +210,13 @@ function (_React$PureComponent) {
         className: classes.root,
         onKeyDown: this.handleKeyDown,
         innerRef: function innerRef(el) {
-          _this2.el = el;
+          _this3.el = el;
         }
       }, itemList.filter(function (item) {
         return !(item.displayed === false);
       }) // don't remove if undefined
       .map(function (item) {
-        return _this2.buildRecursiveListItem(item);
+        return _this3.buildRecursiveListItem(item);
       }));
     }
   }]);

package/es/HiCell/CellRate.js

@@ -12,7 +12,7 @@ export const styles = theme => ({
     overflow: 'hidden',
     position: 'relative',
     textAlign: 'right',
-    paddingTop: '1em'
+    paddingTop: 10
   },
   trendChipIcon: {
     width: 14,

package/es/HiForm/HiUpload.js

@@ -310,14 +310,12 @@ class HiUpload extends React.PureComponent {
     return React.createElement("div", {
       className: classes.flexContainer
     }, React.createElement("label", {
-      htmlFor: "flat-button-file",
       ref: label => {
         this.uploadFieldRef = label;
       },
       tabIndex: "-1"
     }, React.createElement("input", {
       hidden: true,
-      id: "flat-button-file",
       type: !complete || values.length === 1 ? 'file' : 'hidden',
       onChange: this.handleChange,
       onClick: focusable ? this.handleEmptyField : undefined,

package/es/HiSelect/HiDynamicSelect.js

@@ -102,9 +102,7 @@ class HiDynamicSelect extends React.PureComponent {
 
     return React.createElement(HiSelect, _extends({
       buildSelectProps: this.buildSelectProps,
-      hiSelectableListProps: _objectSpread({
-        onSelect: this.handleSelect
-      }, hiSelectableListProps),
+      hiSelectableListProps: _objectSpread({}, hiSelectableListProps),
       multiple: multiple,
       options: options,
       searchable: true,

package/es/HiSelectableList/HiSelectableList.js

@@ -105,16 +105,30 @@ class HiSelectableList extends React.PureComponent {
   }
 
   componentDidMount() {
+    // Focus on last item selected
     if (this.props.overlay && this.props.overlay.getElementsByTagName('li')[0]) {
       let item = this.props.overlay.getElementsByTagName('li')[0];
-      const value = this.props.value && typeof this.props.value === 'object' ? this.props.value[0] : this.props.value;
-
-      if (value) {
-        if (typeof this.props.value[0] === 'string') {
-          item = this.props.overlay.getElementsByTagName('li')[value];
-        } else if (typeof this.props.value[0] === 'number') {
-          item = this.props.overlay.getElementsByTagName('li')[value - 1];
-        }
+
+      if (this.props.value) {
+        let lastSelectedValue = Array.isArray(this.props.value) ? this.props.value[this.props.value.length - 1] : this.props.value;
+        let index = 0;
+        this.props.itemList.forEach(option => {
+          if (option.id === lastSelectedValue) {
+            item = this.props.overlay.getElementsByTagName('li')[index];
+          }
+
+          index++;
+
+          if (option.children && option.children.length) {
+            option.children.forEach(option => {
+              if (option.id === lastSelectedValue) {
+                item = this.props.overlay.getElementsByTagName('li')[index];
+              }
+
+              index++;
+            });
+          }
+        });
       }
 
       item.focus();

package/index.es.js

@@ -1,4 +1,4 @@
-/** @license HiPay-Material-UI v2.0.0-beta.63
+/** @license HiPay-Material-UI v2.0.0-beta.65
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/index.js

@@ -1,4 +1,4 @@
-/** @license HiPay-Material-UI v2.0.0-beta.63
+/** @license HiPay-Material-UI v2.0.0-beta.65
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@hipay/hipay-material-ui",
-  "private": false,
   "author": "HiPay PSYCHE Team",
-  "version": "2.0.0-beta.63",
+  "version": "2.0.0-beta.65",
   "description": "React components that implement Google's Material Design.",
   "keywords": [
     "react",