intelicoreact 0.0.85 → 0.0.91

package/dist/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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "0.0.85",
+  "version": "0.0.91",
   "description": "fix input-calendar",
   "main": "dist/index.js",
   "scripts": {
@@ -23,6 +23,5 @@
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.15.6",
     "anme": "^1.0.0"
-
   }
 }

package/src/Atomic/FormElements/Dropdown/Dropdown.js

@@ -1,36 +1,40 @@
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef, useEffect, useCallback } from 'react';
 import cn from 'classnames';
 import { Check, ChevronDown, ChevronUp } from 'react-feather';
 
+import DropdownLoader from './components/DropdownLoader';
+
 import './Dropdown.scss';
 
 const RC = 'dropdown';
 
-const Dropdown = ({ options = [], value, error, onChange, placeholder, className, isSearchable, entity }) => {
+const Dropdown = ({ options = [], value, error, disabled, onChange, placeholder, className, isSearchable, entity, scrollReactionObj }) => {
   const [isOpen, setIsOpen] = useState(false);
-  const [searchValue, setSearchValue] = useState('');
+  const [searchValue, setSearchValue] = useState();
   const dropdownRef = useRef(null);
+  const dropdownListRef = useRef(null);
+
   if (!options) return null;
   const filteredGroups = options
-    .filter(item => item.items?.length)
-    .map(item => ({ ...item, items: item.items.filter(el => el?.label?.toLowerCase().includes(searchValue?.toLowerCase() || '')) }))
-    .filter(item => item.items?.length > 0);
+    .filter((item) => item.items?.length)
+    .map((item) => ({ ...item, items: item.items.filter((el) => el?.label?.toLowerCase().includes(searchValue?.toLowerCase() || '')) }))
+    .filter((item) => item.items?.length > 0);
 
   const filteredItems = options
-    .filter(item => !item.items?.length)
-    .filter(item => item?.label?.toLowerCase().includes(searchValue?.toLowerCase() || ''));
+    .filter((item) => !item.items?.length)
+    .filter((item) => item?.label?.toLowerCase().includes(searchValue?.toLowerCase() || ''));
 
   const filteredOptions = [...filteredItems, ...filteredGroups];
 
   const modalBtnTrigger = entity && entity !== '' && typeof entity === 'string';
-  const onChangeHandler = item => {
+  const onChangeHandler = (item) => {
     setIsOpen(false);
     setSearchValue(null);
     onChange(item.value);
   };
   // decorator
-  const getDepends = getDependsTrigger => {
-    const newOnChange = e => {
+  const getDepends = (getDependsTrigger) => {
+    const newOnChange = (e) => {
       if (e.value === 'open_modal') {
         onChange('open_modal');
       } else {
@@ -43,34 +47,34 @@ const Dropdown = ({ options = [], value, error, onChange, placeholder, className
       {
         label: `New ${entity}`,
         value: 'open_modal',
-        className: 'dropdown__list-item--modal'
+        className: 'dropdown__list-item--modal',
       },
-      ...filteredOptions
+      ...filteredOptions,
     ];
 
     return {
-      onChange: changeItem => (getDependsTrigger ? newOnChange(changeItem) : onChangeHandler(changeItem)),
-      options: getDependsTrigger ? newOptions : options
+      onChange: (changeItem) => (getDependsTrigger ? newOnChange(changeItem) : onChangeHandler(changeItem)),
+      options: getDependsTrigger ? newOptions : options,
     };
   };
 
-  const handleClickOutside = event => {
+  const handleClickOutside = (event) => {
     if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
       setIsOpen(false);
       setSearchValue(null);
     }
   };
 
-  const onSearchHandler = name => {
+  const onSearchHandler = (name) => {
     setSearchValue(name);
   };
 
-  const hightlightedText = text =>
-    searchValue ? text?.replace(new RegExp(searchValue, 'i'), match => `<span class="bg--yellow">${match}</span>`) : text;
+  const hightlightedText = (text) =>
+    searchValue ? text?.replace(new RegExp(searchValue, 'i'), (match) => `<span class="bg--yellow">${match}</span>`) : text;
 
   const depend = getDepends(modalBtnTrigger);
 
-  const getMarkupForElement = item =>
+  const getMarkupForElement = (item) =>
     item.label.toLowerCase().includes(searchValue?.toLowerCase() || '') ? (
       <button
         key={item.value}
@@ -84,25 +88,51 @@ const Dropdown = ({ options = [], value, error, onChange, placeholder, className
       </button>
     ) : null;
 
-  useEffect(() => {
-    if (!value) setSearchValue(null);
-    document.addEventListener('click', handleClickOutside, true);
-    return () => document.removeEventListener('click', handleClickOutside, true);
-  }, [value]);
-
-  const filteredOptionList = filteredOption =>
+  const filteredOptionList = (filteredOption) =>
     filteredOption.items?.length > 0 ? (
       <div key={filteredOption.value} className={`${RC}-group`}>
         <div className={`${RC}-group__name`}>{filteredOption.label}</div>
-        {filteredOption.items.map(el => getMarkupForElement(el))}
+        {filteredOption.items.map((el) => getMarkupForElement(el))}
       </div>
     ) : null;
 
   const selectedLabel =
-    options.find(el => el.value === value)?.label || options.reduce((acc, item) => acc || item.items?.find(el => el.value === value)?.label, null);
+    options.find((el) => el.value === value)?.label ||
+    options.reduce((acc, item) => acc || item.items?.find((el) => el.value === value)?.label, null);
+
+  const doScrollCallback = useCallback(
+    (e) => {
+      const { callback, isWithAnyScrolling } = scrollReactionObj;
+      if (callback && typeof callback === 'function') {
+        if (isWithAnyScrolling) callback(e);
+        else if (e.target.clientHeight + e.target.scrollTop >= e.target.scrollHeight) callback(e);
+      }
+    },
+    [filteredOptions]
+  );
+
+  useEffect(() => {
+    if (!value) setSearchValue(null);
+    document.addEventListener('click', handleClickOutside, true);
+    return () => document.removeEventListener('click', handleClickOutside, true);
+  }, [value]);
+
+  useEffect(() => {
+    if (scrollReactionObj && typeof scrollReactionObj === 'object' && isOpen && dropdownListRef && dropdownListRef.current) {
+      dropdownListRef.current.addEventListener('scroll', doScrollCallback);
+    }
+    return () => {
+      if (scrollReactionObj && typeof scrollReactionObj === 'object') removeEventListener('scroll', doScrollCallback);
+    };
+  }, [isOpen, dropdownListRef]);
 
   return (
-    <div className={cn(RC, className)} ref={dropdownRef}>
+    <div
+      className={cn(RC, className, {
+        disabled: disabled,
+      })}
+      ref={dropdownRef}
+    >
       <button
         className={`${RC}__trigger input__wrap ${!value ? 'placeholder' : ''} ${error ? 'error' : ''}`}
         onClick={() => (!isSearchable ? setIsOpen(!isOpen) : null)}
@@ -110,12 +140,12 @@ const Dropdown = ({ options = [], value, error, onChange, placeholder, className
         {isSearchable ? (
           <input
             className={`${RC}__input`}
-            value={searchValue || filteredOptions.find(el => el.value === value)?.label || ''}
-            onChange={e => {
+            value={searchValue || selectedLabel || ''}
+            onChange={(e) => {
               onSearchHandler(e.target.value);
             }}
             placeholder={placeholder}
-            onFocus={e => {
+            onFocus={(e) => {
               e.target.select();
               setIsOpen(true);
             }}
@@ -128,10 +158,11 @@ const Dropdown = ({ options = [], value, error, onChange, placeholder, className
         </span>
       </button>
       {isOpen && filteredOptions.length > 0 && (
-        <div className={`${RC}__list`}>
-          {depend.options.map(filteredOption =>
+        <div className={`${RC}__list`} ref={dropdownListRef}>
+          {depend.options.map((filteredOption) =>
             filteredOption.items?.length ? filteredOptionList(filteredOption) : getMarkupForElement(filteredOption)
           )}
+          {disabled && isOpen && <DropdownLoader />}
         </div>
       )}
     </div>

package/src/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%);
@@ -177,4 +178,9 @@
     font-size: 10px;
     color: $color--secondary;
   }
+
+  &.disabled {
+    pointer-events: none;
+    opacity: 0.5;
+  }
 }

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

@@ -20,20 +20,34 @@ export default {
   },
 };
 
-const buttonStyles={
+const blockStyles = {
+  display: 'flex',
+  flexFlow: 'row no-wrap',
+  alignItems: 'center',
+};
+
+const buttonStyles = {
   border: 'solid 1px #000',
-  padding: '5px'
+  padding: '5px',
+  margin: '0 0 0 50px',
 };
 
 const Template = (args) => {
-  const [value, setValue] = useState('');
+  const [value, setValue] = useState(args.value);
+  const [disabled, setDisabled] = useState(false);
   return (
-    <>
-      <div style={{ width: 200 }}>
-        <Dropdown {...args} value={value} onChange={setValue} />
+    <div style={blockStyles}>
+      <div key="dropdown" style={{ width: 200 }}>
+        <Dropdown {...args} value={value} onChange={setValue} disabled={disabled} scrollReactionObj={{ callback: (e) => setDisabled(true) }} />
       </div>
-      <button style={buttonStyles} className='mt10' onClick={() => {console.log('click!'); setValue('')}} >Reset</button>
-    </>
+      <button key="reset" style={buttonStyles} className="mt10" onClick={() => setValue('')}>
+        Reset
+      </button>
+
+      <button key="enable/disable" style={buttonStyles} className="mt10" onClick={() => setDisabled(!disabled)}>
+        {disabled ? 'enable' : 'disable'}
+      </button>
+    </div>
   );
 };
 

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import './Loader.scss';
+
+const DropdownLoader = function () {
+  return (
+    <div className="dropdown-loader-box j5">
+      <div className={`lds-ring${variant === 'little' ? ' lds-ring_little' : ''}`}>
+        <div />
+        <div />
+        <div />
+        <div />
+      </div>
+    </div>
+  );
+};
+
+export default DropdownLoader;

package/src/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/src/Atomic/FormElements/Input/Input.js

@@ -29,7 +29,7 @@ const Input = ({
   icon,
   symbolsLimit,
   blinkTime,
-  isFocusDefault = false
+  isFocusDefault = false,
 }) => {
   const DEFAULT_BLINK_TIME = 100;
   // STATES
@@ -42,6 +42,8 @@ const Input = ({
 
   const { onlyNumbers, onlyString } = formatInput;
   const { addCommas, removeComma } = formatInput.priceInput;
+  const isUseErrorsBlink = !isNotBlinkErrors && !mask;
+
   // HANDLES
   const handle = {
     change: (e) => {
@@ -50,8 +52,7 @@ const Input = ({
         inputValue = inputValue.substring(0, +symbolsLimit);
       }
 
-      if (isOnlyNumber && !isTwoDigitAfterDot)
-        inputValue = onlyNumbers(inputValue);
+      if (isOnlyNumber && !isTwoDigitAfterDot) inputValue = onlyNumbers(inputValue);
       if (isTwoDigitAfterDot) inputValue = onlyNumbers(inputValue, true);
       if (isOnlyString) inputValue = onlyString(inputValue);
 
@@ -79,28 +80,47 @@ const Input = ({
       if (onBlur) onBlur(e);
     },
     keyUp: (e) => {
-      if (!isNotBlinkErrors) {
+      if (isUseErrorsBlink) {
         const changedValue = '' + (value ?? '');
         const previousValue = '' + (previousValueRef.current ?? '');
-        const currentSet = (() => {
-          if (previousValue.length < changedValue.length)
-            return value.slice(previousValue.length - changedValue.length);
-          else return changedValue.includes(e.key) ? e.key : '';
-        })();
-
-        if (
-          !KEYBOARD_SERVICE_KEYS.includes(e.key) &&
-          changedValue === previousValue
-        )
-          setIsAttemptToChange(true);
-
-        if (KEYBOARD_SERVICE_KEYS.includes(e.key) || !currentSet)
-          previousValueRef.current = value;
-        else previousValueRef.current = previousValue + currentSet[0];
+
+        const short = previousValue.length <= changedValue.length ? previousValue : changedValue;
+        const long = previousValue.length > changedValue.length ? previousValue : changedValue;
+
+        const infoAboutDifferencesSameness = short.split('').reduce(
+          (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: [] }
+        );
+
+        const samePart = infoAboutDifferencesSameness.same.join('');
+        const differencesLength = infoAboutDifferencesSameness.differences.length;
+        const currentSet = changedValue.replace(samePart, '');
+
+        const getNext = (inputPartToAdd, correctedSamePart) => {
+          const partToAdd = inputPartToAdd || currentSet;
+          const currentSamePart = correctedSamePart || samePart;
+          return changedValue.includes(e.key) && e.key !== changedValue[changedValue.length - 1]
+            ? currentSamePart + (partToAdd[0] || '')
+            : changedValue;
+        };
+
+        if (!KEYBOARD_SERVICE_KEYS.includes(e.key) && changedValue === previousValue)
+          setIsAttemptToChange(!(!differencesLength && e.key === changedValue[changedValue.length - 2]));
+
+        if (!previousValueRef.current || 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);
-    }
+    },
   };
 
   function cutOffsingleDot(value) {
@@ -121,7 +141,7 @@ const Input = ({
     onBlur: handle.blur,
     onKeyUp: handle.keyUp,
     ...(maskChar ? { maskChar } : {}),
-    ...(formatChars ? { formatChars } : {})
+    ...(formatChars ? { formatChars } : {}),
   };
 
   function renderInput() {
@@ -129,13 +149,11 @@ const Input = ({
       return <InputMask {...uniProps} ref={inputRef} mask={mask} />;
     }
 
-    return (
-      <input {...uniProps} ref={inputRef} type={isPriceInput ? 'text' : type} />
-    );
+    return <input {...uniProps} ref={inputRef} type={isPriceInput ? 'text' : type} />;
   }
 
   useEffect(() => {
-    if (!isNotBlinkErrors && isAttemptToChange) {
+    if (isUseErrorsBlink && isAttemptToChange) {
       setIsAttemptToChange(null);
       setIsToHighlightError(true);
       setTimeout(() => {
@@ -145,8 +163,8 @@ const Input = ({
   }, [isAttemptToChange]);
 
   useEffect(() => {
-    if (inputRef?.current && typeof isFocusDefault === 'boolean')
-      setIsFocused(isFocusDefault);
+    if (inputRef?.current && typeof isFocusDefault === 'boolean') setIsFocused(isFocusDefault);
+    setEditing(isFocusDefault);
   }, [inputRef, isFocusDefault]);
 
   return (
@@ -160,12 +178,7 @@ const Input = ({
     >
       {renderInput()}
       {icon}
-      {withDelete && (
-        <span
-          className={cn(`input__close`, { hidden: !value })}
-          onClick={handle.toggleEdit}
-        />
-      )}
+      {withDelete && <span className={cn(`input__close`, { hidden: !value })} onClick={handle.toggleEdit} />}
     </div>
   );
 };

package/src/Atomic/FormElements/InputCalendar/InputCalendar.js

@@ -18,6 +18,14 @@ const InputCalendar = ({ value, minDate, maxDate, onChange, className = '', plac
     if (onChange) onChange(val);
   };
 
+  const getCalendarValue = (value) => {
+    const date = moment(value).format('L');
+
+    if(date !== "Invalid date") return date;
+
+    return moment(new Date()).format('L');
+  }
+
   return (
     <div className={`input__wrap calendar-container ${className}`} ref={calendarRef}>
       <InputMask
@@ -28,7 +36,7 @@ const InputCalendar = ({ value, minDate, maxDate, onChange, className = '', plac
         className="calendar-dropdown"
         onFocus={() => setIsOpened(!isOpened)}
       />
-      {isOpened ? <Calendar date={moment(value).format('L')} setDate={newDate => changeCalendarDay(newDate)} params={{ minDate, maxDate }} /> : null}
+      {isOpened ? <Calendar date={getCalendarValue(value)} setDate={newDate => changeCalendarDay(newDate)} params={{ minDate, maxDate }} /> : null}
     </div>
   );
 };

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

@@ -1,26 +1,30 @@
-import moment from 'moment-timezone';
-import React, { useRef, useState } from 'react';
-import { ref } from 'yup';
+import React, { useState } from 'react';
 import InputCalendar from './InputCalendar';
 
 global.lng = 'en';
 
+
 export default {
-  title: 'Form Elements/InputCalendar',
+  title: 'Form Elements/Input Calendar',
   component: InputCalendar,
+  argTypes: {
+    value: {
+      description: 'string (mm.dd.yyyy)'
+    },
+  }
 };
 
-const [date, setDate] = useState('');
-
 const Template = args => {
-  return <InputCalendar {...args} value={date} />;
+  const [date, setDate] = useState('');
+
+  return <InputCalendar {...args} value={date} onChange={val => setDate(val)} />;
 };
 
-export const Calendar = Template.bind({});
+export const CalendarTemplate = Template.bind({});
 
-Calendar.args = {
+CalendarTemplate.args = {
   value: '',
   minDate: '10/14/2020',
   maxDate: '10/14/2022',
-  onChange: val => setDate(val)
+
 };

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

@@ -24,6 +24,8 @@ const InputDateRange = props => {
     hideArrows = false,
     isOptionsRight,
     isUseAbs,
+    minDate = null,
+    maxDate = null,
   } = props;
 
   const actualValues = getActualDateRange(value);
@@ -35,6 +37,7 @@ const InputDateRange = props => {
   const internalContainerRef = useRef(null);
 
   const handleChange = input => {
+
     const newValue = getActualDateRange(input);
     const formatedValue = {
       intervalKey: newValue.intervalKey,
@@ -202,6 +205,8 @@ const InputDateRange = props => {
               setIsCompare={setIsCompare}
               toggleOff={toggleOff}
               onChange={handleChange}
+              minDate={minDate ? moment(minDate) : null}
+              maxDate={maxDate ? moment(maxDate) : null}
             />
           )}
         </div>

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

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