intelicoreact 0.0.85 → 0.0.91

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

@@ -41,7 +41,9 @@ const Datepicker = props => {
         limitRange,
         handleItemClick,
         setActiveInterval,
-        isShortWeekNames
+        isShortWeekNames,
+        minDate = null,
+        maxDate = null
     } = props;
     const { start = null, end = null, compare = false } = values;
     const startDateInputRef = useRef(null);
@@ -191,7 +193,7 @@ const Datepicker = props => {
     const handleChangeStartHour = val => {
         setStartHour(+val);
         setStartDate(
-            moment(startDate)
+            moment(startDate || moment())
                 .set('hour', +val)
                 .toDate(),
         );
@@ -200,14 +202,16 @@ const Datepicker = props => {
     const handleChangeEndHour = val => {
         const newHour = +val;
         setEndHour(newHour);
-        let newEndDate;
-        if (prevEndHour.current === 0 && newHour !== 0) {
-            newEndDate = moment(endDate).subtract(1, 'days');
-        } else if (prevEndHour.current !== 0 && newHour === 0) {
-            newEndDate = moment(endDate).add(1, 'days');
-        } else {
-            newEndDate = endDate;
+        let newEndDate = moment();
+
+        if(endDate){
+          if (prevEndHour.current === 0 && newHour !== 0) {
+              newEndDate = moment(endDate).subtract(1, 'days');
+          } else if (prevEndHour.current !== 0 && newHour === 0) {
+              newEndDate = moment(endDate).add(1, 'days');
+          }
         }
+
         prevEndHour.current = newHour;
         setEndDate(moment(newEndDate).set('hour', newHour).toDate());
     };
@@ -256,13 +260,22 @@ const Datepicker = props => {
 
     const handleStartDateBlur = e => {
         let newDate;
-        if (moment(startDateInput).isValid()) {
-            newDate = moment(startDateInput).set('hour', parseInt(startHour, 10)).toDate();
-            setStartDate(newDate);
+
+        if(!moment(startDateInput).isValid()){
+          newDate = startDate;
         } else {
-            newDate = startDate;
-            setStartDateInput(newDate);
+          if(minDate && !moment(startDateInput).isSameOrAfter(minDate)){
+            newDate = minDate;
+          } else if(maxDate && !moment(startDateInput).isSameOrBefore(maxDate)){
+            newDate = maxDate;
+          } else {
+            newDate = moment(startDateInput);
+          }
         }
+
+        setStartDateInput(newDate);
+        setStartDate(newDate.set('hour', parseInt(startHour, 10)).toDate());
+
         doBlur('start', e);
         setDate1(
             moment(newDate).isSameOrAfter(moment(date2), 'month') ? moment(date2).subtract(1, 'month') : moment(newDate),
@@ -277,16 +290,24 @@ const Datepicker = props => {
 
     const handleEndDateBlur = e => {
         let newDate;
-        if (moment(endDateInput).isValid()) {
-            newDate = moment(endDateInput).set('hour', parseInt(endHour, 10)).toDate();
-            setEndDate(addDay(newDate));
+
+        if(!moment(endDateInput).isValid()){
+          newDate = endDate;
         } else {
-            newDate = endDate;
-            setEndDateInput(newDate);
+          if(minDate && !moment(endDateInput).isSameOrAfter(minDate)){
+            newDate = minDate;
+          } else if(maxDate && !moment(endDateInput).isSameOrBefore(maxDate)){
+            newDate = maxDate;
+          } else {
+            newDate = moment(endDateInput);
+          }
         }
+
+        setEndDate(addDay(newDate.set('hour', parseInt(endHour, 10)).toDate()));
+        setEndDateInput(newDate);
+
         doBlur('end', e);
         setDate2(newDate);
-        setEndDateInput();
     };
 
     const handleKeyPressed = (code, e, type) => {

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

@@ -25,7 +25,9 @@ const OpenedPart = React.forwardRef((props, ref) => {
         isCompare,
         setIsCompare,
         toggleOff,
-        isShortWeekNames
+        isShortWeekNames,
+        minDate = null,
+        maxDate = null
     } = props;
 
     const items = isCompact ? [...Object.keys(intervals)] : [...Object.keys(intervals), customKey];
@@ -105,6 +107,8 @@ const OpenedPart = React.forwardRef((props, ref) => {
                         limitRange={limitRange}
                         setActiveInterval={setActiveInterval}
                         isShortWeekNames={isShortWeekNames}
+                        minDate={minDate}
+                        maxDate={maxDate}
                     />
                 )}
             </div>

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

@@ -89,7 +89,7 @@ export const INTERVALS = {
         end: () => moment().startOf('month'),
     },
     last6Months: {
-        label: 'Last 6 Months',
+        label: '6 Months',
         start: () => moment().subtract(6, 'month').startOf('month'),
         end: () => moment().startOf('month'),
     },

package/src/Atomic/FormElements/NumericInput/NumericInput.js

@@ -192,6 +192,7 @@ const NumericInput = ({
   useEffect(() => {
     if (inputRef?.current && typeof isFocusDefault === 'boolean')
       setIsFocused(isFocusDefault);
+      setEditing(isFocusDefault)
   }, [inputRef, isFocusDefault]);
 
   function renderInput() {

package/src/Atomic/UI/Calendar/Calendar.js

@@ -70,7 +70,7 @@ export default function (props) {
   };
 
   return (
-    <div className={`calendar ${className}`}>
+    <div className={`calendar ${className ? className : ""}`}>
       <div className="calendar-header">
         <div className="calendar-header__prev">
           {allowPrev && (

package/src/Atomic/UI/Calendar/Calendar.scss

@@ -429,6 +429,12 @@
   display: flex;
   justify-content: center;
   align-items: center;
+
+  &__prev,
+  &__next{
+    display: flex;
+    height: auto;
+  }
 }
 .calendar {
   background: #ffffff;
@@ -515,6 +521,7 @@
     position: relative;
     .calendar {
       position: absolute;
+      z-index: 9;
       top: 100%;
       padding: 10px 16px;
       border: 1px solid var(--border-color);