intelicoreact 0.0.86 → 0.0.92

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

@@ -2,13 +2,15 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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"));
@@ -21,11 +23,13 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _reactFeather = require("react-feather");
 
+var _DropdownLoader = _interopRequireDefault(require("./components/DropdownLoader"));
+
 require("./Dropdown.scss");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -34,29 +38,33 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var RC = 'dropdown';
 
 var Dropdown = function Dropdown(_ref) {
-  var _options$find, _filteredOptions$find;
+  var _options$find;
 
   var _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
       value = _ref.value,
       error = _ref.error,
+      disabled = _ref.disabled,
       onChange = _ref.onChange,
       placeholder = _ref.placeholder,
       className = _ref.className,
       isSearchable = _ref.isSearchable,
-      entity = _ref.entity;
+      entity = _ref.entity,
+      scrollReactionObj = _ref.scrollReactionObj,
+      isListTop = _ref.isListTop;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       isOpen = _useState2[0],
       setIsOpen = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(''),
+  var _useState3 = (0, _react.useState)(),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       searchValue = _useState4[0],
       setSearchValue = _useState4[1];
 
   var dropdownRef = (0, _react.useRef)(null);
+  var dropdownListRef = (0, _react.useRef)(null);
   if (!options) return null;
   var filteredGroups = options.filter(function (item) {
     var _item$items;
@@ -153,14 +161,6 @@ var Dropdown = function Dropdown(_ref) {
     })) : null;
   };
 
-  (0, _react.useEffect)(function () {
-    if (!value) setSearchValue(null);
-    document.addEventListener('click', handleClickOutside, true);
-    return function () {
-      return document.removeEventListener('click', handleClickOutside, true);
-    };
-  }, [value]);
-
   var filteredOptionList = function filteredOptionList(filteredOption) {
     var _filteredOption$items;
 
@@ -183,8 +183,34 @@ var Dropdown = function Dropdown(_ref) {
       return el.value === value;
     })) === null || _item$items4$find === void 0 ? void 0 : _item$items4$find.label);
   }, null);
+  var doScrollCallback = (0, _react.useCallback)(function (e) {
+    var callback = scrollReactionObj.callback,
+        isWithAnyScrolling = scrollReactionObj.isWithAnyScrolling;
+
+    if (callback && typeof callback === 'function') {
+      if (isWithAnyScrolling) callback(e);else if (e.target.clientHeight + e.target.scrollTop >= e.target.scrollHeight) callback(e);
+    }
+  }, [filteredOptions]);
+  (0, _react.useEffect)(function () {
+    if (!value) setSearchValue(null);
+    document.addEventListener('click', handleClickOutside, true);
+    return function () {
+      return document.removeEventListener('click', handleClickOutside, true);
+    };
+  }, [value]);
+  (0, _react.useEffect)(function () {
+    if (scrollReactionObj && (0, _typeof2.default)(scrollReactionObj) === 'object' && isOpen && dropdownListRef && dropdownListRef.current) {
+      dropdownListRef.current.addEventListener('scroll', doScrollCallback);
+    }
+
+    return function () {
+      if (scrollReactionObj && (0, _typeof2.default)(scrollReactionObj) === 'object') removeEventListener('scroll', doScrollCallback);
+    };
+  }, [isOpen, dropdownListRef]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(RC, className),
+    className: (0, _classnames.default)(RC, className, {
+      disabled: disabled
+    }),
     ref: dropdownRef
   }, /*#__PURE__*/_react.default.createElement("button", {
     className: "".concat(RC, "__trigger input__wrap ").concat(!value ? 'placeholder' : '', " ").concat(error ? 'error' : ''),
@@ -193,9 +219,7 @@ var Dropdown = function Dropdown(_ref) {
     }
   }, isSearchable ? /*#__PURE__*/_react.default.createElement("input", {
     className: "".concat(RC, "__input"),
-    value: searchValue || ((_filteredOptions$find = filteredOptions.find(function (el) {
-      return el.value === value;
-    })) === null || _filteredOptions$find === void 0 ? void 0 : _filteredOptions$find.label) || '',
+    value: searchValue || selectedLabel || '',
     onChange: function onChange(e) {
       onSearchHandler(e.target.value);
     },
@@ -212,12 +236,13 @@ var Dropdown = function Dropdown(_ref) {
       return setIsOpen(!isOpen);
     }
   }, isOpen ? /*#__PURE__*/_react.default.createElement(_reactFeather.ChevronUp, null) : /*#__PURE__*/_react.default.createElement(_reactFeather.ChevronDown, null))), isOpen && filteredOptions.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(RC, "__list")
+    className: (0, _classnames.default)("".concat(RC, "__list"), (0, _defineProperty2.default)({}, "".concat(RC, "__list-top"), isListTop)),
+    ref: dropdownListRef
   }, depend.options.map(function (filteredOption) {
     var _filteredOption$items2;
 
     return (_filteredOption$items2 = filteredOption.items) !== null && _filteredOption$items2 !== void 0 && _filteredOption$items2.length ? filteredOptionList(filteredOption) : getMarkupForElement(filteredOption);
-  })));
+  }), disabled && isOpen && /*#__PURE__*/_react.default.createElement(_DropdownLoader.default, null)));
 };
 
 var _default = Dropdown;

package/dist/Atomic/FormElements/Dropdown/Dropdown.scss

@@ -45,6 +45,7 @@
   }
 
   &__list {
+    position: relative;
     background: #ffffff;
     border: 1px solid #e2e5ec;
     box-shadow: 0 5px 20px rgb(0 0 0 / 15%);
@@ -70,6 +71,12 @@
       border-radius: 4px;
     }
 
+    &-top {
+      bottom: calc(100% + 4px);
+      top: auto;
+      box-shadow: 0 -3px 10px rgb(0 0 0 / 15%);
+    }
+
     &-item {
       display: flex;
       align-items: center;
@@ -177,4 +184,9 @@
     font-size: 10px;
     color: $color--secondary;
   }
+
+  &.disabled {
+    pointer-events: none;
+    opacity: 0.5;
+  }
 }

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

@@ -44,37 +44,65 @@ var _default = {
   }
 };
 exports.default = _default;
+var blockStyles = {
+  display: 'flex',
+  flexFlow: 'row no-wrap',
+  alignItems: 'center'
+};
 var buttonStyles = {
   border: 'solid 1px #000',
-  padding: '5px'
+  padding: '5px',
+  margin: '0 0 0 50px'
 };
 
 var Template = function Template(args) {
-  var _useState = (0, _react.useState)(''),
+  var _useState = (0, _react.useState)(args.value),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       value = _useState2[0],
       setValue = _useState2[1];
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      disabled = _useState4[0],
+      setDisabled = _useState4[1];
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: blockStyles
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    key: "dropdown",
     style: {
       width: 200
     }
   }, /*#__PURE__*/_react.default.createElement(_Dropdown.default, (0, _extends2.default)({}, args, {
     value: value,
-    onChange: setValue
+    onChange: setValue,
+    disabled: disabled,
+    scrollReactionObj: {
+      callback: function callback(e) {
+        return setDisabled(true);
+      }
+    }
   }))), /*#__PURE__*/_react.default.createElement("button", {
+    key: "reset",
+    style: buttonStyles,
+    className: "mt10",
+    onClick: function onClick() {
+      return setValue('');
+    }
+  }, "Reset"), /*#__PURE__*/_react.default.createElement("button", {
+    key: "enable/disable",
     style: buttonStyles,
     className: "mt10",
     onClick: function onClick() {
-      console.log('click!');
-      setValue('');
+      return setDisabled(!disabled);
     }
-  }, "Reset"));
+  }, disabled ? 'enable' : 'disable'));
 };
 
 var DropdownTemplate = Template.bind({});
 exports.DropdownTemplate = DropdownTemplate;
 DropdownTemplate.args = {
+  isListTop: true,
   entity: 'entity',
   value: 'drop6',
   placeholder: 'Placeholder',

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

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./Loader.scss");
+
+var DropdownLoader = function DropdownLoader(_ref) {
+  var variant = _ref.variant;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "dropdown-loader-box j5"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "lds-ring".concat(variant === 'little' ? ' lds-ring_little' : '')
+  }, /*#__PURE__*/_react.default.createElement("div", null), /*#__PURE__*/_react.default.createElement("div", null), /*#__PURE__*/_react.default.createElement("div", null), /*#__PURE__*/_react.default.createElement("div", null)));
+};
+
+var _default = DropdownLoader;
+exports.default = _default;

package/dist/Atomic/FormElements/Dropdown/components/Loader.scss

@@ -0,0 +1,57 @@
+@mixin fill-parent {
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.dropdown-loader-box {
+  position: absolute;
+  @include fill-parent;
+  background: #fff;
+  opacity: 0.1;
+  z-index: 100;
+}
+.lds-ring {
+  display: inline-block;
+  position: relative;
+  width: 100px;
+  height: 100px;
+}
+.lds-ring.lds-ring_little {
+  width: 20px;
+  height: 20px;
+}
+.lds-ring div {
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  width: 84px;
+  height: 84px;
+  margin: 8px;
+  border: 8px solid #000;
+  border-radius: 50%;
+  animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+  border-color: #000 transparent transparent transparent;
+}
+.lds-ring_little div {
+  width: 20px;
+  height: 20px;
+}
+.lds-ring div:nth-child(1) {
+  animation-delay: -0.45s;
+}
+.lds-ring div:nth-child(2) {
+  animation-delay: -0.3s;
+}
+.lds-ring div:nth-child(3) {
+  animation-delay: -0.15s;
+}
+@keyframes lds-ring {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}

package/dist/Atomic/FormElements/Input/Input.js

@@ -90,7 +90,8 @@ var Input = function Input(_ref) {
       onlyString = _inputExecutor.formatInput.onlyString;
   var _formatInput$priceInp = _inputExecutor.formatInput.priceInput,
       addCommas = _formatInput$priceInp.addCommas,
-      removeComma = _formatInput$priceInp.removeComma; // HANDLES
+      removeComma = _formatInput$priceInp.removeComma;
+  var isUseErrorsBlink = !isNotBlinkErrors && !mask; // HANDLES
 
   var handle = {
     change: function change(e) {
@@ -129,18 +130,36 @@ var Input = function Input(_ref) {
       if (onBlur) onBlur(e);
     },
     keyUp: function keyUp(e) {
-      if (!isNotBlinkErrors) {
+      if (isUseErrorsBlink) {
         var _previousValueRef$cur;
 
         var changedValue = '' + (value !== null && value !== void 0 ? value : '');
         var previousValue = '' + ((_previousValueRef$cur = previousValueRef.current) !== null && _previousValueRef$cur !== void 0 ? _previousValueRef$cur : '');
-
-        var currentSet = function () {
-          if (previousValue.length < changedValue.length) return value.slice(previousValue.length - changedValue.length);else return changedValue.includes(e.key) ? e.key : '';
-        }();
-
-        if (!_index.KEYBOARD_SERVICE_KEYS.includes(e.key) && changedValue === previousValue) setIsAttemptToChange(true);
-        if (_index.KEYBOARD_SERVICE_KEYS.includes(e.key) || !currentSet) previousValueRef.current = value;else previousValueRef.current = previousValue + currentSet[0];
+        var short = previousValue.length <= changedValue.length ? previousValue : changedValue;
+        var long = previousValue.length > changedValue.length ? previousValue : changedValue;
+        var infoAboutDifferencesSameness = short.split('').reduce(function (acc, symbol, idx) {
+          if (acc.countOn && symbol === long[idx]) acc.same.push(symbol);else {
+            acc.countOn = false;
+            acc.differences.push([idx, symbol]);
+          }
+          return acc;
+        }, {
+          same: [],
+          countOn: true,
+          differences: []
+        });
+        var samePart = infoAboutDifferencesSameness.same.join('');
+        var differencesLength = infoAboutDifferencesSameness.differences.length;
+        var currentSet = changedValue.replace(samePart, '');
+
+        var getNext = function getNext(inputPartToAdd, correctedSamePart) {
+          var partToAdd = inputPartToAdd || currentSet;
+          var currentSamePart = correctedSamePart || samePart;
+          return changedValue.includes(e.key) && e.key !== changedValue[changedValue.length - 1] ? currentSamePart + (partToAdd[0] || '') : changedValue;
+        };
+
+        if (!_index.KEYBOARD_SERVICE_KEYS.includes(e.key) && changedValue === previousValue) setIsAttemptToChange(!(!differencesLength && e.key === changedValue[changedValue.length - 2]));
+        if (!previousValueRef.current || _index.KEYBOARD_SERVICE_KEYS.includes(e.key)) previousValueRef.current = getNext();else if (changedValue === samePart) previousValueRef.current = getNext(changedValue, changedValue.slice(0, -1));else previousValueRef.current = getNext();
       }
 
       if (onKeyUp) onKeyUp(e.keyCode, e);
@@ -185,7 +204,7 @@ var Input = function Input(_ref) {
   }
 
   (0, _react.useEffect)(function () {
-    if (!isNotBlinkErrors && isAttemptToChange) {
+    if (isUseErrorsBlink && isAttemptToChange) {
       setIsAttemptToChange(null);
       setIsToHighlightError(true);
       setTimeout(function () {
@@ -195,6 +214,7 @@ var Input = function Input(_ref) {
   }, [isAttemptToChange]);
   (0, _react.useEffect)(function () {
     if (inputRef !== null && inputRef !== void 0 && inputRef.current && typeof isFocusDefault === 'boolean') setIsFocused(isFocusDefault);
+    setEditing(isFocusDefault);
   }, [inputRef, isFocusDefault]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("input__wrap", (0, _defineProperty2.default)({}, "input__wrap_focus", isFocused), (0, _defineProperty2.default)({}, "input__wrap_error", error || isToHighlightError), (0, _defineProperty2.default)({}, "input__wrap_disabled", disabled))

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

@@ -35,7 +35,8 @@ var InputCalendar = function InputCalendar(_ref) {
       _ref$placeholder = _ref.placeholder,
       placeholder = _ref$placeholder === void 0 ? 'mm/dd/yyyy' : _ref$placeholder,
       _ref$mask = _ref.mask,
-      mask = _ref$mask === void 0 ? '99/99/9999' : _ref$mask;
+      mask = _ref$mask === void 0 ? '99/99/9999' : _ref$mask,
+      dontLimitFuture = _ref.dontLimitFuture;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -57,7 +58,7 @@ var InputCalendar = function InputCalendar(_ref) {
 
   var getCalendarValue = function getCalendarValue(value) {
     var date = (0, _moment.default)(value).format('L');
-    if (date !== "Invalid date") return date;
+    if (date !== 'Invalid date') return date;
     return (0, _moment.default)(new Date()).format('L');
   };
 
@@ -75,7 +76,7 @@ var InputCalendar = function InputCalendar(_ref) {
     onFocus: function onFocus() {
       return setIsOpened(!isOpened);
     }
-  }), console.log(value, getCalendarValue(value)), isOpened ? /*#__PURE__*/_react.default.createElement(_Calendar.default, {
+  }), isOpened ? /*#__PURE__*/_react.default.createElement(_Calendar.default, {
     date: getCalendarValue(value),
     setDate: function setDate(newDate) {
       return changeCalendarDay(newDate);
@@ -83,7 +84,8 @@ var InputCalendar = function InputCalendar(_ref) {
     params: {
       minDate: minDate,
       maxDate: maxDate
-    }
+    },
+    dontLimitFuture: dontLimitFuture
   }) : null);
 };
 

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

@@ -51,6 +51,7 @@ var CalendarTemplate = Template.bind({});
 exports.CalendarTemplate = CalendarTemplate;
 CalendarTemplate.args = {
   value: '',
-  minDate: '10/14/2020',
-  maxDate: '10/14/2022'
+  // minDate: '10/14/2020',
+  // maxDate: '10/14/2022',
+  dontLimitFuture: true
 };

package/dist/Atomic/FormElements/InputDateRange/InputDateRange.js

@@ -55,7 +55,11 @@ var InputDateRange = function InputDateRange(props) {
       _props$hideArrows = props.hideArrows,
       hideArrows = _props$hideArrows === void 0 ? false : _props$hideArrows,
       isOptionsRight = props.isOptionsRight,
-      isUseAbs = props.isUseAbs;
+      isUseAbs = props.isUseAbs,
+      _props$minDate = props.minDate,
+      minDate = _props$minDate === void 0 ? null : _props$minDate,
+      _props$maxDate = props.maxDate,
+      maxDate = _props$maxDate === void 0 ? null : _props$maxDate;
   var actualValues = (0, _dependencies.getActualDateRange)(value);
 
   var _useToggle = (0, _dependencies.useToggle)(false),
@@ -223,7 +227,9 @@ var InputDateRange = function InputDateRange(props) {
     isCompare: isCompare,
     setIsCompare: setIsCompare,
     toggleOff: toggleOff,
-    onChange: handleChange
+    onChange: handleChange,
+    minDate: minDate ? (0, _momentTimezone.default)(minDate) : null,
+    maxDate: maxDate ? (0, _momentTimezone.default)(maxDate) : null
   })))), error && /*#__PURE__*/_react.default.createElement("span", {
     className: "date-range-input__error-block"
   }, error));

package/dist/Atomic/FormElements/InputDateRange/InputDateRange.stories.js

@@ -77,6 +77,8 @@ InputDateRangeTemplate.args = {
   error: false,
   disabled: false,
   isHoverable: false,
+  minDate: "",
+  maxDate: "",
   // short: true,
   isCompact: false,
   // isFocused: true,

package/dist/Atomic/FormElements/InputDateRange/components/Datepicker.js

@@ -67,7 +67,11 @@ var Datepicker = function Datepicker(props) {
       limitRange = props.limitRange,
       handleItemClick = props.handleItemClick,
       setActiveInterval = props.setActiveInterval,
-      isShortWeekNames = props.isShortWeekNames;
+      isShortWeekNames = props.isShortWeekNames,
+      _props$minDate = props.minDate,
+      minDate = _props$minDate === void 0 ? null : _props$minDate,
+      _props$maxDate = props.maxDate,
+      maxDate = _props$maxDate === void 0 ? null : _props$maxDate;
   var _values$start = values.start,
       start = _values$start === void 0 ? null : _values$start,
       _values$end = values.end,
@@ -275,20 +279,20 @@ var Datepicker = function Datepicker(props) {
 
   var handleChangeStartHour = function handleChangeStartHour(val) {
     setStartHour(+val);
-    setStartDate((0, _momentTimezone.default)(startDate).set('hour', +val).toDate());
+    setStartDate((0, _momentTimezone.default)(startDate || (0, _momentTimezone.default)()).set('hour', +val).toDate());
   };
 
   var handleChangeEndHour = function handleChangeEndHour(val) {
     var newHour = +val;
     setEndHour(newHour);
-    var newEndDate;
+    var newEndDate = (0, _momentTimezone.default)();
 
-    if (prevEndHour.current === 0 && newHour !== 0) {
-      newEndDate = (0, _momentTimezone.default)(endDate).subtract(1, 'days');
-    } else if (prevEndHour.current !== 0 && newHour === 0) {
-      newEndDate = (0, _momentTimezone.default)(endDate).add(1, 'days');
-    } else {
-      newEndDate = endDate;
+    if (endDate) {
+      if (prevEndHour.current === 0 && newHour !== 0) {
+        newEndDate = (0, _momentTimezone.default)(endDate).subtract(1, 'days');
+      } else if (prevEndHour.current !== 0 && newHour === 0) {
+        newEndDate = (0, _momentTimezone.default)(endDate).add(1, 'days');
+      }
     }
 
     prevEndHour.current = newHour;
@@ -343,14 +347,20 @@ var Datepicker = function Datepicker(props) {
   var handleStartDateBlur = function handleStartDateBlur(e) {
     var newDate;
 
-    if ((0, _momentTimezone.default)(startDateInput).isValid()) {
-      newDate = (0, _momentTimezone.default)(startDateInput).set('hour', parseInt(startHour, 10)).toDate();
-      setStartDate(newDate);
-    } else {
+    if (!(0, _momentTimezone.default)(startDateInput).isValid()) {
       newDate = startDate;
-      setStartDateInput(newDate);
+    } else {
+      if (minDate && !(0, _momentTimezone.default)(startDateInput).isSameOrAfter(minDate)) {
+        newDate = minDate;
+      } else if (maxDate && !(0, _momentTimezone.default)(startDateInput).isSameOrBefore(maxDate)) {
+        newDate = maxDate;
+      } else {
+        newDate = (0, _momentTimezone.default)(startDateInput);
+      }
     }
 
+    setStartDateInput(newDate);
+    setStartDate(newDate.set('hour', parseInt(startHour, 10)).toDate());
     doBlur('start', e);
     setDate1((0, _momentTimezone.default)(newDate).isSameOrAfter((0, _momentTimezone.default)(date2), 'month') ? (0, _momentTimezone.default)(date2).subtract(1, 'month') : (0, _momentTimezone.default)(newDate));
   };
@@ -366,17 +376,22 @@ var Datepicker = function Datepicker(props) {
   var handleEndDateBlur = function handleEndDateBlur(e) {
     var newDate;
 
-    if ((0, _momentTimezone.default)(endDateInput).isValid()) {
-      newDate = (0, _momentTimezone.default)(endDateInput).set('hour', parseInt(endHour, 10)).toDate();
-      setEndDate(addDay(newDate));
-    } else {
+    if (!(0, _momentTimezone.default)(endDateInput).isValid()) {
       newDate = endDate;
-      setEndDateInput(newDate);
+    } else {
+      if (minDate && !(0, _momentTimezone.default)(endDateInput).isSameOrAfter(minDate)) {
+        newDate = minDate;
+      } else if (maxDate && !(0, _momentTimezone.default)(endDateInput).isSameOrBefore(maxDate)) {
+        newDate = maxDate;
+      } else {
+        newDate = (0, _momentTimezone.default)(endDateInput);
+      }
     }
 
+    setEndDate(addDay(newDate.set('hour', parseInt(endHour, 10)).toDate()));
+    setEndDateInput(newDate);
     doBlur('end', e);
     setDate2(newDate);
-    setEndDateInput();
   };
 
   var handleKeyPressed = function handleKeyPressed(code, e, type) {

package/dist/Atomic/FormElements/InputDateRange/components/OpenedPart.js

@@ -56,7 +56,11 @@ var OpenedPart = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       isCompare = props.isCompare,
       setIsCompare = props.setIsCompare,
       toggleOff = props.toggleOff,
-      isShortWeekNames = props.isShortWeekNames;
+      isShortWeekNames = props.isShortWeekNames,
+      _props$minDate = props.minDate,
+      minDate = _props$minDate === void 0 ? null : _props$minDate,
+      _props$maxDate = props.maxDate,
+      maxDate = _props$maxDate === void 0 ? null : _props$maxDate;
 
   var items = isCompact ? (0, _toConsumableArray2.default)(Object.keys(_dependencies.INTERVALS)) : [].concat((0, _toConsumableArray2.default)(Object.keys(_dependencies.INTERVALS)), [_dependencies.CUSTOM_INTERVAL_KEY]);
 
@@ -148,7 +152,9 @@ var OpenedPart = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     isCompareHidden: isCompareHidden,
     limitRange: limitRange,
     setActiveInterval: setActiveInterval,
-    isShortWeekNames: isShortWeekNames
+    isShortWeekNames: isShortWeekNames,
+    minDate: minDate,
+    maxDate: maxDate
   })));
 });
 

package/dist/Atomic/FormElements/InputDateRange/dependencies.js

@@ -154,7 +154,7 @@ var INTERVALS = {
     }
   },
   last6Months: {
-    label: 'Last 6 Months',
+    label: '6 Months',
     start: function start() {
       return (0, _momentTimezone.default)().subtract(6, 'month').startOf('month');
     },

package/dist/Atomic/FormElements/NumericInput/NumericInput.js

@@ -225,6 +225,7 @@ var NumericInput = function NumericInput(_ref) {
   }, [isFocused]);
   (0, _react.useEffect)(function () {
     if (inputRef !== null && inputRef !== void 0 && inputRef.current && typeof isFocusDefault === 'boolean') setIsFocused(isFocusDefault);
+    setEditing(isFocusDefault);
   }, [inputRef, isFocusDefault]);
 
   function renderInput() {