intelicoreact 0.2.59 → 0.2.63

package/dist/Atomic/FormElements/Dropdown/Dropdown.js

@@ -11,10 +11,10 @@ exports.default = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -76,7 +76,27 @@ var Dropdown = function Dropdown(_ref) {
       setIsFocusedByClick = _useState6[1];
 
   if (!options) return null;
-  var filteredGroups = options.filter(function (item) {
+
+  var moveOtherToEnd = function moveOtherToEnd(options) {
+    var otherIndex = options === null || options === void 0 ? void 0 : options.findIndex(function (option) {
+      return (option === null || option === void 0 ? void 0 : option.value) === 'other';
+    });
+
+    if (otherIndex > -1) {
+      var other = options === null || options === void 0 ? void 0 : options.splice(otherIndex, 1);
+      options.push.apply(options, (0, _toConsumableArray2.default)(other));
+    }
+
+    return options;
+  };
+
+  var optionsWithOtherAtTheEnd = moveOtherToEnd(options);
+  options.map(function (option) {
+    if (option.items) {
+      return option.items = moveOtherToEnd(option.items);
+    } else return option;
+  });
+  var filteredGroups = optionsWithOtherAtTheEnd.filter(function (item) {
     var _item$items;
 
     return (_item$items = item.items) === null || _item$items === void 0 ? void 0 : _item$items.length;
@@ -93,7 +113,7 @@ var Dropdown = function Dropdown(_ref) {
 
     return ((_item$items2 = item.items) === null || _item$items2 === void 0 ? void 0 : _item$items2.length) > 0;
   });
-  var filteredItems = options.filter(function (item) {
+  var filteredItems = optionsWithOtherAtTheEnd.filter(function (item) {
     var _item$items3;
 
     return !((_item$items3 = item.items) !== null && _item$items3 !== void 0 && _item$items3.length);

package/dist/Atomic/FormElements/InputCalendar/InputCalendar.js

@@ -98,8 +98,8 @@ var InputCalendar = function InputCalendar(_ref) {
     var _inputRef$current;
 
     var value = inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value;
-    var isSettedMaxDate = !disabledFormattedMaxDate && value && typeof isOpened === 'boolean' && (0, _momentTimezone.default)(value, format).format(format) === 'Invalid date';
-    if (isSettedMaxDate) onChange(formattedMaxDate !== null && formattedMaxDate !== void 0 ? formattedMaxDate : '');else if (value && typeof isOpened === 'boolean' && (0, _momentTimezone.default)(value, format).startOf('day').isBefore(momentMinDate, 'days')) onChange(formattedMinDate);else if (value && typeof isOpened === 'boolean' && (0, _momentTimezone.default)(value, format).endOf('day').isAfter(momentMaxDate, 'days')) onChange(formattedMaxDate);else if (value) onChange((0, _momentTimezone.default)(value, format).format(format));
+    if ((0, _momentTimezone.default)(value, format).format(format) === 'Invalid date' || value.indexOf('_') > -1) value = '';
+    if (value && typeof isOpened === 'boolean' && (0, _momentTimezone.default)(value, format).startOf('day').isBefore(momentMinDate, 'days')) onChange(formattedMinDate);else if (value && typeof isOpened === 'boolean' && (0, _momentTimezone.default)(value, format).endOf('day').isAfter(momentMaxDate, 'days')) onChange(formattedMaxDate);else if (value) onChange((0, _momentTimezone.default)(value, format).format(format));
   };
 
   var onKeyDown = function onKeyDown(e) {
@@ -119,7 +119,13 @@ var InputCalendar = function InputCalendar(_ref) {
       setOpenedByEnter(true);
     }
 
-    if (isValidLenght) handleBlur();
+    if (isValidLenght) {
+      setIsOpened(false);
+      handleBlur();
+    } else {
+      setIsOpened(true);
+    }
+
     onKeyUpProp(e);
   };
 

package/dist/Atomic/UI/Modal/Modal.js

@@ -32,7 +32,9 @@ var KEY_CODE = Object.freeze({
 exports.KEY_CODE = KEY_CODE;
 
 var Modal = function Modal(_ref) {
-  var isOpen = _ref.isOpen,
+  var _ref$index = _ref.index,
+      index = _ref$index === void 0 ? 1 : _ref$index,
+      isOpen = _ref.isOpen,
       onConfirm = _ref.onConfirm,
       closeModal = _ref.closeModal,
       children = _ref.children,
@@ -87,6 +89,9 @@ var Modal = function Modal(_ref) {
     };
   }, [submitOnEnter]);
   return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      zIndex: index
+    },
     "data-testid": 'test-modal',
     className: "modal-box j5"
   }, /*#__PURE__*/_react.default.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "0.2.59",
+  "version": "0.2.63",
   "description": "",
   "main": "dist/index.js",
   "files": [