intelicoreact 0.0.8 → 0.0.9

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

@@ -7,6 +7,9 @@ import { formatInput } from '../../../Functions/inputExecutor';
 
 import './NumericInput.scss';
 
+let timerOutside;
+let timerFocus;
+
 const NumericInput = ({
   onChange,
   disabled,
@@ -17,7 +20,6 @@ const NumericInput = ({
   value,
   placeholder,
   className,
-  type = 'number',
   onBlur,
   onFocus,
   onKeyUp,
@@ -29,21 +31,30 @@ const NumericInput = ({
   symbolsLimit,
   isNotBlinkErrors,
   blinkTime,
-  isPriceInput
+  isPriceInput,
+  isFocusDefault = false
 }) => {
   const DEFAULT_BLINK_TIME = 200;
-  // STATES
-  const [isFocused, setIsFocused] = useState(false);
-  const [isEditing, setEditing] = useState(false);
+
+  //REFS
   const inputRef = useRef(null);
   const decRef = useRef(null);
   const incRef = useRef(null);
+  const wrapRef = useRef(null);
+
   const previousValueRef = useRef(value);
-  const [isAttemptToChange, setIsAttemptToChange] = useState(false);
-  const [isToHighlightError, setIsToHighlightError] = useState(false);
 
+  // STATES
+  const [inputValue, setInputValue] = useState(value || min || '');
+  const [inputValueFormated, setInputValueFormated] = useState(inputValue);
   const [intMemoVal, setIntMemoVal] = useState(0);
 
+  const [isFocused, setIsFocused] = useState(false);
+  const [isEditing, setEditing] = useState(false);
+
+  const [isAttemptToChange, setIsAttemptToChange] = useState(false);
+  const [isToHighlightError, setIsToHighlightError] = useState(false);
+
   const { onlyNumbers } = formatInput;
   const { addCommas, removeComma } = formatInput.priceInput;
 
@@ -51,8 +62,12 @@ const NumericInput = ({
   const handle = {
     change: (e) => {
       let inputValue = e.target ? onlyNumbers(e.target.value) : e;
-      if (inputValue !== '') {
-        inputValue = parseFloat(inputValue) || '';
+
+      if (
+        inputValue &&
+        (decRef.current.contains(e.target) || incRef.current.contains(e.target))
+      ) {
+        inputValue = parseFloat(inputValue);
         if (min && +min > inputValue) {
           inputValue = min;
         } else if (max && +max < inputValue) inputValue = max;
@@ -60,28 +75,21 @@ const NumericInput = ({
       if (symbolsLimit) {
         inputValue = inputValue.toString().substring(0, +symbolsLimit);
       }
-
-      setIntMemoVal(parseFloat(inputValue));
-      onChange(inputValue.toString());
+      setInputValue(inputValue.toString());
     },
-    toggleEdit: () => {
-      setEditing(!isEditing);
-      onChange('');
+    clear: () => {
+      handle.change(min || '');
     },
     focus: (e) => {
+      if (isFocused) return;
       setIsFocused(true);
-      if (isPriceInput) onChange(removeComma(value));
       if (onFocus) onFocus(e);
     },
     blur: (e) => {
+      if (!isFocused) return;
+
       setIsFocused(false);
       setEditing(false);
-      if (isPriceInput) {
-        if (!isFinite(value)) {
-          value = intMemoVal;
-        }
-        onChange(addCommas(value));
-      }
 
       if (onBlur) onBlur(e);
     },
@@ -110,27 +118,26 @@ const NumericInput = ({
 
       if (onKeyUp) onKeyUp(e.keyCode, e.target.value);
     },
-    decrement: () => {
+    decrement: (e) => {
       handle.change(intMemoVal - +numStep);
     },
-    increment: () => {
+    increment: (e) => {
       handle.change(intMemoVal + +numStep);
     }
   };
 
-  const handleClickOutside = (event) => {
-    if (
-      inputRef.current &&
-      !inputRef.current.contains(event.target) &&
-      !decRef.current.contains(event.target) &&
-      !incRef.current.contains(event.target)
-    ) {
-      setTimeout(() => {
-        inputRef.current.focus();
-        inputRef.current.blur();
-      }, 0);
-    }
-  };
+  //Check Outside Click
+  useEffect(() => {
+    const handleClickOutside = (event) => {
+      if (!wrapRef.current.contains(event.target)) {
+        setIsFocused(false);
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside, true);
+    return () =>
+      document.removeEventListener('mousedown', handleClickOutside, true);
+  }, []);
 
   useEffect(() => {
     if (!isNotBlinkErrors && isAttemptToChange) {
@@ -142,51 +149,86 @@ const NumericInput = ({
     }
   }, [isAttemptToChange]);
 
+  //On Input Value Change
   useEffect(() => {
-    document.addEventListener('click', handleClickOutside, true);
-    return () =>
-      document.removeEventListener('click', handleClickOutside, true);
-  }, []);
+    if (inputValue !== value) setIsFocused(true);
 
+    setInputValueFormated(
+      isPriceInput
+        ? isFocused
+          ? removeComma(inputValue)
+          : addCommas(inputValue)
+        : inputValue
+    );
+    setIntMemoVal(parseInt(inputValue));
+
+    if (typeof onChange === 'function') onChange(inputValue?.toString());
+  }, [inputValue]);
+
+  //On Integer Value Change
   useEffect(() => {
-    if (isNaN(intMemoVal)) setIntMemoVal(min || '');
+    if (isNaN(intMemoVal)) setIntMemoVal(min || 0);
   }, [intMemoVal]);
 
+  //On Focuse Change
   useEffect(() => {
-    if (isEditing || isFocused) inputRef.current.focus();
-  }, [isEditing, isFocused]);
-
-  const uniProps = {
-    className: `input ${className}`,
-    placeholder,
-    value: value || '',
-    disabled,
-    onChange: handle.change,
-    onFocus: handle.focus,
-    onBlur: handle.blur,
-    onKeyUp: handle.keyUp,
-    min,
-    max,
-    ...(maskChar ? { maskChar } : {}),
-    ...(formatChars ? { formatChars } : {})
-  };
+    setInputValueFormated(
+      isPriceInput
+        ? isFocused
+          ? removeComma(inputValue)
+          : addCommas(inputValue)
+        : inputValue
+    );
+
+    if (isFocused) {
+      if (typeof onFocus === 'function') onFocus({ target: inputRef?.current });
+      inputRef?.current?.focus();
+    } else {
+      if (typeof onBlur === 'function') onBlur({ target: inputRef?.current });
+      inputRef?.current?.blur();
+    }
+  }, [isFocused]);
+
+  useEffect(() => {
+    if (inputRef?.current && typeof isFocusDefault === 'boolean')
+      setIsFocused(isFocusDefault);
+      setEditing(isFocusDefault)
+  }, [inputRef, isFocusDefault]);
 
   function renderInput() {
+    const uniProps = {
+      className: `input ${className || ''}`,
+      placeholder,
+      value: inputValueFormated,
+      disabled,
+      onChange: handle.change,
+      onFocus: () => {
+        setIsFocused(true);
+        setEditing(true);
+      },
+      onBlur: () => setEditing(false),
+      onKeyUp: handle.keyUp,
+      min,
+      max,
+      ...(maskChar ? { maskChar } : {}),
+      ...(formatChars ? { formatChars } : {})
+    };
+
     return (
       <>
-        <input {...uniProps} ref={inputRef} type={type} />
+        <input {...uniProps} ref={inputRef} type='text' />
 
         <div className='input__nums'>
           <button
             ref={decRef}
-            onClick={() => handle.decrement()}
+            onMouseDown={(e) => handle.decrement(e)}
             className={cn(`input__num-btn`, { disabled: +value <= min })}
           >
             <Minus />
           </button>
           <button
             ref={incRef}
-            onClick={() => handle.increment()}
+            onMouseDown={(e) => handle.increment(e)}
             className={cn(`input__num-btn`, { disabled: +value >= max })}
           >
             <Plus />
@@ -198,6 +240,7 @@ const NumericInput = ({
 
   return (
     <div
+      ref={wrapRef}
       className={cn(
         `input__wrap`,
         { [`input__wrap_focus`]: isFocused },
@@ -209,8 +252,8 @@ const NumericInput = ({
       {icon}
       {withDelete && (
         <span
-          className={cn(`input__close`, { hidden: !value })}
-          onClick={handle.toggleEdit}
+          className={cn(`input__close`, { hidden: !inputValue })}
+          onClick={() => handle.clear()}
         />
       )}
     </div>

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

@@ -11,6 +11,9 @@ export default {
     disabled: {
       description: 'boolean'
     },
+    isFocusDefault: {
+      description: 'boolean - if true, input will be focused on mount'
+    },
     isInitialFocus: {
       description: 'boolean - if true, the input will be focused on mount'
     },
@@ -35,25 +38,6 @@ export default {
     placeholder: {
       description: 'text'
     },
-    type: {
-      description:
-        "'text', 'number', 'password', 'color', 'date', 'datetime-local', 'month', 'time', 'email', 'range'",
-      control: {
-        type: 'select',
-        options: [
-          'text',
-          'number',
-          'password',
-          'color',
-          'date',
-          'datetime-local',
-          'month',
-          'time',
-          'email',
-          'range'
-        ]
-      }
-    },
     icon: { description: 'JSX' },
     value: { description: '(* - required prop)' },
     className: { description: 'string' },
@@ -71,15 +55,15 @@ export default {
 };
 
 const Template = (args) => {
-  const [value, setValue] = useState('');
+  const [value, setValue] = useState('15000');
   return <NumericInput {...args} value={value} onChange={setValue} />;
 };
 
 export const NumericInputTemplate = Template.bind({});
 
 NumericInputTemplate.args = {
-  type: 'text',
   disabled: false,
+  isFocusDefault: false,
   error: '',
   isPriceInput: false,
   mask: '',
@@ -88,7 +72,7 @@ NumericInputTemplate.args = {
   numStep: 100,
   min: '0',
   max: '15000',
-  symbolsLimit: 2,
+  symbolsLimit: 5,
   placeholder: 'Placeholder',
   icon: <User />
 };

package/src/Atomic/FormElements/RangeCalendar/RangeCalendar.js

@@ -88,7 +88,7 @@ const RangeCalendar = props => {
                 onMouseOver={day && !isFutureDay ? () => onHover(day.date) : null}
                 onMouseLeave={() => onHover(null)}
             >
-                {day && day.date.getDate()}
+              <span className="calendar__day-num">{day && day.date.getDate()}</span>
             </div>
         );
     };

package/src/Atomic/FormElements/RangeCalendar/RangeCalendar.scss

@@ -1,4 +1,4 @@
-.range-calendar {
+.range-calendar, .calendar {
   width: 195px;
   min-height: 195px;
   display: flex;
@@ -12,7 +12,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-  
+
     &__title {
       line-height: 20px;
       font-weight: 500;
@@ -27,7 +27,7 @@
     &__next, &__prev {
       width: 16px;
       height: 16px;
-      background-color: #E2E6F8;
+      //background-color: #E2E6F8;
       border-radius: 5px;
       color: #171D33;
     }
@@ -98,4 +98,4 @@
       }
     }
   }
-}
+}

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

@@ -6,7 +6,7 @@ import './Calendar.scss';
 
 export default function (props) {
   const { date, setDate, allowPrev = true, allowNext = true, params, className } = props;
-  const { minDate, maxDate } = params;
+  const { minDate = '01/01/1900', maxDate = moment().format('MM/DD/YYYY') } = params;
   const [days, setDays] = useState({});
   const [showDate, setShowDate] = useState(date);
 
@@ -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 && (
@@ -92,7 +92,7 @@ export default function (props) {
         {[...Array(7).keys()].map((dayOfWeek) => {
           return (
             <div key={`day-of-week_${dayOfWeek}`} className="calendar__day calendar__day--title">
-              {moment().weekday(dayOfWeek).format('dd').charAt(0)}
+              {moment().weekday(dayOfWeek).format('dd')}
             </div>
           );
         })}

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

@@ -425,7 +425,17 @@
 //     box-shadow: 0 0 3px 0 rgb(0 123 255 / 50%);
 //   }
 // }
+.calendar-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
 
+  &__prev,
+  &__next{
+    display: flex;
+    height: auto;
+  }
+}
 .calendar {
   background: #ffffff;
     border: 1px solid #e2e5ec;
@@ -507,15 +517,21 @@
   }
 
   &-container {
-    width: 200px;
+    min-width: 200px;
+    position: relative;
+    .calendar {
+      position: absolute;
+      z-index: 9;
+      top: 100%;
+      padding: 10px 16px;
+      border: 1px solid var(--border-color);
+    }
   }
 
   &-dropdown {
     appearance: none;
     background-color: white;
     cursor: pointer;
-    color: gray;
-
     width: 100%;
     height: 28px;
 

package/src/Functions/inputExecutor.js

@@ -4,38 +4,29 @@ export const formatInput = {
       value = value.toString();
       const isFraction = value.includes('.');
 
-      const valueBeforeDot = isFraction
-        ? value.slice(0, value.indexOf('.'))
-        : value;
+      const valueBeforeDot = isFraction ? value.slice(0, value.indexOf('.')) : value;
 
       const intPart = valueBeforeDot
         .split('')
         .reverse()
-        .reduce(
-          (acc, item, idx) =>
-            idx % 3 === 0 && idx !== 0 ? [...acc, ',', item] : [...acc, item],
-          []
-        )
+        .reduce((acc, item, idx) => (idx % 3 === 0 && idx !== 0 ? [...acc, ',', item] : [...acc, item]), [])
         .reverse()
         .join('');
 
       return isFraction ? intPart + value.slice(value.indexOf('.')) : intPart;
     },
     removeComma: (value) => {
-      return parseFloat(value.toString().replace(/\,/g, ''));
-    }
+      return parseInt(value.toString().replace(/\,/g, ''));
+    },
   },
   onlyNumbers: (value, isDot = false) => {
-    const val =
-      value.slice(0, 1) !== '0' && value.slice(0, 1) !== '.'
-        ? value
-        : value.slice(1);
+    const val = value.slice(0, 1) !== '0' && value.slice(0, 1) !== '.' ? value : value.slice(1);
     if (isDot) return twoDigitAfterDot(val.replace(/[^0-9.]/g, ''));
     else return +val.toString().replace(/\D/g, '');
   },
   onlyString: (value) => {
     return value.toString().replace(/[^a-z]/gi, '');
-  }
+  },
 };
 
 //обрезает числа после точки до 2х