intelicoreact 0.0.63 → 0.0.71

package/dist/scss/main.scss

@@ -1,5 +1,5 @@
 @import './fonts';
-@import './anme/styles.scss';
+@import '~anme/scss/styles.scss';
 
 body {
     font-family: 'Roboto', sans-serif;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "intelicoreact",
-  "version": "0.0.63",
-  "description": "Range selector fixes",
+  "version": "0.0.71",
+  "description": "Date range fixes and dropdown refactor",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -14,13 +14,15 @@
     "moment-timezone": "^0.5.34",
     "react": "^17.0.2",
     "react-feather": "^2.0.9",
-    "react-input-mask": "^2.0.4"
+    "react-input-mask": "^2.0.4",
+    "classnames": "^2.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.7",
     "@babel/core": "^7.15.5",
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.15.6",
-    "classnames": "^2.3.1"
+    "anme": "^1.0.0"
+
   }
 }

package/src/Atomic/FormElements/CheckboxInput/CheckboxInput.js

@@ -3,11 +3,21 @@ import cn from 'classnames';
 
 import './CheckboxInput.scss';
 
-const CheckboxInput = ({ label, id, value, onChange, disabled, className }) => {
+const CheckboxInput = ({ label, id, value, onChange, disabled, className, isStark }) => {
   return (
     <label className={cn('checkbox-input', className, { [`checkbox-input_disabled`]: disabled })} htmlFor={id}>
       <div className={cn(`checkbox-input__input`, { [`checkbox-input__input_checked`]: value })}>
-        <input id={id} type="checkbox" className="checkbox-input__checkbox" onChange={e => onChange(!value, e)} checked={value} disabled={disabled} />
+        <input
+          id={id}
+          type="checkbox"
+          className="checkbox-input__checkbox"
+          onChange={(e) => onChange(!value, e)}
+          checked={value}
+          disabled={disabled}
+          ref={(elem) => {
+            if (elem) elem.indeterminate = isStark;
+          }}
+        />
         <span className="checkbox-input__mark" />
       </div>
       {label && <div className="checkbox-input__label">{label}</div>}

package/src/Atomic/FormElements/CheckboxInput/CheckboxInput.scss

@@ -1,76 +1,107 @@
 .checkbox-input {
-    display: flex;
-    align-items: center;
-    cursor: pointer;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+
+  &_disabled {
+    opacity: 0.5;
+    pointer-events: none;
+    cursor: auto;
+  }
 
-    &_disabled {
-        opacity: .5;
-        pointer-events: none;
-        cursor: auto;
+  &:hover {
+    .checkbox-input__input {
+      background-color: rgba(#6b81dd, 0.2);
     }
+  }
+
+  &__input {
+    position: relative;
+    height: 14px;
+    width: 14px;
+    min-width: 14px;
+    border: 1px solid #9aa0b9;
+    border-radius: 2px;
+    overflow: hidden;
+    margin-right: 5px;
+    cursor: pointer;
+    transition: background-color 0.2s ease;
+    background-color: #ffff;
 
-    &:hover {
-        .checkbox-input__input {
-            background-color: rgba(#6b81dd, .2);
-        }
+    &_checked {
+      border-color: #6b81dd;
     }
 
-    &__input {
-        position: relative;
-        height: 14px;
-        width: 14px;
-        min-width: 14px;
-        border: 1px solid #9AA0B9;
-        border-radius: 2px;
-        overflow: hidden;
-        margin-right: 5px;
-        cursor: pointer;
-        transition: background-color .2s ease;
-        background-color: #ffff;
+    .checkbox-input__checkbox:checked ~ .checkbox-input__mark {
+      display: block;
+    }
+  }
 
-        &_checked {
-            border-color: #6b81dd;
-        }
+  &__checkbox {
+    opacity: 0;
+    position: absolute;
+    height: 0;
+    width: 0;
+  }
 
-        .checkbox-input__checkbox:checked ~ .checkbox-input__mark {
-            display: block;
-        }
+  &__mark {
+    display: none;
+    position: absolute;
+    width: 14px;
+    height: 14px;
+    background-color: #6b81dd;
 
+    &:after {
+      content: "";
+      position: absolute;
+      top: -2px;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+      width: 4px;
+      height: 8px;
+      border: solid white;
+      border-radius: 2px;
+      border-width: 0 2px 2px 0;
+      transform: rotate(45deg);
     }
+  }
 
-    &__checkbox {
-        opacity: 0;
-        position: absolute;
-        height: 0;
-        width: 0;
-    }
+  &__label {
+    font-size: 13px;
+    user-select: none;
+  }
 
-    &__mark {
-        display: none;
+  input[type="checkbox" i] {
+    &:indeterminate {
+      display: block;
+      width: 100%;
+      height: 100%;
+      &:after {
+        content: "";
         position: absolute;
-        width: 14px;
-        height: 14px;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        width: 100%;
+        height: 100%;
         background-color: #6b81dd;
-
-        &:after {
-            content: '';
-            position: absolute;
-            top: -2px;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            margin: auto;
-            width: 4px;
-            height: 8px;
-            border: solid white;
-            border-radius: 2px;
-            border-width: 0 2px 2px 0;
-            transform: rotate(45deg);
-        }
-    }
-
-    &__label{
-        font-size: 13px;
-        user-select: none;
+      }
+      &:before {
+        content: "";
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        width: 65%;
+        border: solid white;
+        border-radius: 2px;
+        border-width: 0 2px 2px 0;
+        z-index: 1;
+      }
     }
+  }
 }

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

@@ -5,10 +5,10 @@ global.lng = 'en';
 
 export default {
   title: 'Form Elements/CheckboxInput',
-  component: CheckboxInput
+  component: CheckboxInput,
 };
 
-const Template = args => {
+const Template = (args) => {
   const { value: argsValue } = args;
   const [value, setValue] = useState(argsValue);
 
@@ -21,5 +21,6 @@ Checkbox.args = {
   label: 'Test label',
   value: true,
   disabled: false,
-  forced: false
+  forced: false,
+  isStark: true,
 };

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

@@ -1,17 +1,16 @@
 import React, { useState, useRef, useEffect } from 'react';
 import cn from 'classnames';
 import { Check, ChevronDown, ChevronUp } from 'react-feather';
-import Label from '../Label/Label';
 
 import './Dropdown.scss';
 
 const RC = 'dropdown';
 
-const Dropdown = ({ options, value, error, onChange, placeholder, className, isSearchable }) => {
+const Dropdown = ({ options, value, error, onChange, placeholder, className, isSearchable, entity }) => {
   const [isOpen, setIsOpen] = useState(false);
   const [searchValue, setSearchValue] = useState('');
   const dropdownRef = 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() || '')) }))
@@ -23,6 +22,38 @@ const Dropdown = ({ options, value, error, onChange, placeholder, className, isS
 
   const filteredOptions = [...filteredItems, ...filteredGroups];
 
+  const modalBtnTrigger = entity && entity !== '' && typeof entity === 'string';
+  const onChangeHandler = item => {
+    setIsOpen(false);
+    setSearchValue(null);
+    onChange(item.value);
+  };
+  // decorator
+  const getDepends = getDependsTrigger => {
+    const newOnChange = e => {
+      if (e.value === 'open_modal') {
+        onChange('open_modal');
+      } else {
+        onChangeHandler(e);
+      }
+    };
+
+    // add pseudo option
+    const newOptions = [
+      {
+        label: `New ${entity}`,
+        value: 'open_modal',
+        className: 'dropdown__list-item--modal'
+      },
+      ...filteredOptions
+    ];
+
+    return {
+      onChange: changeItem => (getDependsTrigger ? newOnChange(changeItem) : onChangeHandler(changeItem)),
+      options: getDependsTrigger ? newOptions : options
+    };
+  };
+
   const handleClickOutside = event => {
     if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
       setIsOpen(false);
@@ -30,12 +61,6 @@ const Dropdown = ({ options, value, error, onChange, placeholder, className, isS
     }
   };
 
-  const onChangeHandler = item => {
-    setIsOpen(false);
-    setSearchValue(null);
-    onChange(item.value);
-  };
-
   const onSearchHandler = name => {
     setSearchValue(name);
   };
@@ -43,11 +68,13 @@ const Dropdown = ({ options, value, error, onChange, placeholder, className, isS
   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 =>
     item.label.toLowerCase().includes(searchValue?.toLowerCase() || '') ? (
       <button
         key={item.value}
-        onClick={() => onChangeHandler(item)}
+        onClick={() => depend.onChange(item)}
         className={cn(`${RC}__list-item`, { [`${RC}__list-item_active`]: item.value === value }, { [`${RC}__list-item_disabled`]: item.disabled })}
       >
         <span className={cn(`${RC}__active-icon`, { [`${RC}__active-icon_active`]: item.value === value })}>
@@ -58,9 +85,10 @@ const Dropdown = ({ options, value, error, onChange, placeholder, className, isS
     ) : null;
 
   useEffect(() => {
+    if (!value) setSearchValue(null);
     document.addEventListener('click', handleClickOutside, true);
     return () => document.removeEventListener('click', handleClickOutside, true);
-  });
+  }, [value]);
 
   const filteredOptionList = filteredOption =>
     filteredOption.items?.length > 0 ? (
@@ -75,19 +103,25 @@ const Dropdown = ({ options, value, error, onChange, placeholder, className, isS
 
   return (
     <div className={cn(RC, className)} ref={dropdownRef}>
-      <button className={`${RC}__trigger input__wrap ${!value ? 'placeholder' : ''} ${error ? 'error' : ''}`} onClick={() => !isSearchable ? setIsOpen(!isOpen) : null}>
+      <button
+        className={`${RC}__trigger input__wrap ${!value ? 'placeholder' : ''} ${error ? 'error' : ''}`}
+        onClick={() => (!isSearchable ? setIsOpen(!isOpen) : null)}
+      >
         {isSearchable ? (
           <input
             className={`${RC}__input`}
-            value={searchValue ?? selectedLabel}
-            onChange={e => onSearchHandler(e.target.value)}
+            value={searchValue || filteredOptions.find(el => el.value === value)?.label || ''}
+            onChange={e => {
+              onSearchHandler(e.target.value);
+            }}
             placeholder={placeholder}
-            onFocus={() => setIsOpen(true)}
+            onFocus={e => {
+              e.target.select();
+              setIsOpen(true);
+            }}
           />
         ) : (
-          <span className="text">
-            {selectedLabel || placeholder}
-          </span>
+          <span className="text">{selectedLabel || placeholder}</span>
         )}
         <span className={cn(`${RC}__arrow`, { [`${RC}__arrow_active`]: isOpen })} onClick={() => setIsOpen(!isOpen)}>
           {isOpen ? <ChevronUp /> : <ChevronDown />}
@@ -95,7 +129,7 @@ const Dropdown = ({ options, value, error, onChange, placeholder, className, isS
       </button>
       {isOpen && filteredOptions.length > 0 && (
         <div className={`${RC}__list`}>
-          {filteredOptions.map(filteredOption =>
+          {depend.options.map(filteredOption =>
             filteredOption.items?.length ? filteredOptionList(filteredOption) : getMarkupForElement(filteredOption)
           )}
         </div>

package/src/Atomic/FormElements/Dropdown/Dropdown.scss

@@ -5,6 +5,7 @@
   flex-direction: column;
   position: relative;
   width: 100%;
+  border-radius: 7px;
 
   &__trigger {
     background: #ffffff;
@@ -28,8 +29,8 @@
     &.error {
       border-color: $color--secondary;
     }
-    &.placeholder .text{
-      opacity: .7;
+    &.placeholder .text {
+      opacity: 0.7;
     }
   }
 
@@ -85,7 +86,24 @@
       width: 100%;
       height: 24px;
       white-space: nowrap;
-
+      overflow-x: hidden;
+
+      &--modal {
+        color: #1f7499;
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.2px;
+        position: relative;
+        &:after {
+          content: "";
+          position: absolute;
+          bottom: -2px;
+          height: 1px;
+          width: 300%;
+          transform: translateX(-50%);
+          background-color: #e8e9ec;
+        }
+      }
       &:hover,
       &_active {
         background: $color--gray--gentle;

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

@@ -7,35 +7,48 @@ export default {
   component: Dropdown,
   argTypes: {
     className: {
-      description: 'string'
+      description: 'string',
     },
-    value: { description: 'string - current option'},
+    value: { description: 'string - current option' },
     isSearchable: {
       description: 'boolean - enable search',
     },
-    onChange: { description: 'callback return selected value'}
-  }
+    onChange: { description: 'callback return selected value' },
+    entity: {
+      description: 'string',
+    },
+  },
+};
+
+const buttonStyles={
+  border: 'solid 1px #000',
+  padding: '5px'
 };
 
-const Template = args => {
+const Template = (args) => {
   const [value, setValue] = useState('');
   return (
-    <div style={{ width: 200 }}>
-      <Dropdown {...args} value={value} onChange={setValue} />
-    </div>
+    <>
+      <div style={{ width: 200 }}>
+        <Dropdown {...args} value={value} onChange={setValue} />
+      </div>
+      <button style={buttonStyles} className='mt10' onClick={() => {console.log('click!'); setValue('')}} >Reset</button>
+    </>
   );
 };
 
 export const DropdownTemplate = Template.bind({});
 
 DropdownTemplate.args = {
+  entity: 'entity',
+  value: 'drop6',
   placeholder: 'Placeholder',
   isSearchable: true,
   options: [
-    { label: 'Dropdown1', value: 'drop1', className: 'status status--approved' },
     { label: 'Dropdown2', value: 'drop2' },
     { label: 'Dropdown3', value: 'drop3', disabled: true },
     { label: 'Dropdown4', value: 'drop4' },
+    { label: 'Dropdown1', value: 'drop1', className: 'status status--approved' },
     { label: 'Dropdown5', value: 'drop5' },
     { label: 'Dropdown6', value: 'drop6' },
     {
@@ -43,17 +56,17 @@ DropdownTemplate.args = {
       items: [
         { label: 'Group 11', value: 'group11' },
         { label: 'Group 12', value: 'group12', disabled: true },
-        { label: 'Group 13', value: 'group13' }
-      ]
+        { label: 'Group 13', value: 'group13' },
+      ],
     },
     {
       label: 'Some Group 2',
       items: [
         { label: 'Group 21', value: 'group21' },
         { label: 'Group 22', value: 'group22' },
-        { label: 'Group 23', value: 'group23' }
-      ]
-    }
+        { label: 'Group 23', value: 'group23' },
+      ],
+    },
   ],
-  error: ''
+  error: '',
 };

package/src/Atomic/FormElements/Input/Input.js

@@ -21,6 +21,8 @@ const Input = ({
   onFocus,
   onKeyUp,
   mask,
+  maskChar,
+  formatChars,
   error,
   icon,
   symbolsLimit,
@@ -72,6 +74,8 @@ const Input = ({
     onKeyUp: handle.keyUp,
     min,
     max,
+    ...(maskChar ? { maskChar } : {}),
+    ...(formatChars ? { formatChars } : {}),
   };
 
   function renderInput() {

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

@@ -67,7 +67,13 @@ InputTemplate.args = {
   min: '0',
   max: '5',
   placeholder: 'Placeholder',
-  mask: '',
+  // mask: 'nnnnn0129',
+  // maskChar: '_',
+  // formatChars: {
+  //   'n': '[0-9]',
+  //   's': '[A-Za-z]',
+  //   '*': '[A-Za-z0-9]'
+  // },
   icon: <User />,
   symbolsLimit: 225
 };

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, useMemo } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import cn from 'classnames';
 import moment from 'moment-timezone';
 
@@ -15,22 +15,15 @@ const InputDateRange = props => {
     id,
     label,
     className,
-    buttonsTypes,
     value,
     onChange = () => {},
     error,
     disabled,
     isHoverable,
-    short,
     isCompact = false,
-    // isFocused = false,
-    isIntervalsHidden = false,
-    isCompareHidden = false,
     hideArrows = false,
     isOptionsRight,
-    limitRange,
     isUseAbs,
-    absTooltip
   } = props;
 
   const actualValues = getActualDateRange(value);
@@ -40,7 +33,25 @@ const InputDateRange = props => {
 
   const ref = !isUseAbs ? useClickOutside(toggleOff) : useRef(null);
   const internalContainerRef = useRef(null);
-  const isEndDateNearFuture = moment(actualValues?.end).isSameOrAfter(moment());
+
+  const handleChange = input => {
+    const newValue = getActualDateRange(input);
+    const formatedValue = {
+      intervalKey: newValue.intervalKey,
+      start: newValue.start ? moment(newValue.start).format('YYYY-MM-DDTHH:mm') : newValue.start,
+      end: newValue.end ? moment(newValue.end).format('YYYY-MM-DDTHH:mm') : newValue.end,
+      ...(newValue.compare ? { compare: newValue.compare } : {}),
+      ...(newValue.startPrevDate ? { startPrevDate: moment(newValue.startPrevDate).format('YYYY-MM-DDTHH:mm') } : {}),
+      ...(newValue.endPrevDate ? { endPrevDate: moment(newValue.endPrevDate).format('YYYY-MM-DDTHH:mm') } : {})
+    };
+
+    onChange(formatedValue);
+    return formatedValue;
+  };
+
+  useEffect(() => {
+    handleChange({ ...value });
+  }, []);
 
   const Range = () => {
     const SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
@@ -95,7 +106,7 @@ const InputDateRange = props => {
     }
     const startPrevDate = moment(newStart).subtract(intervalHoursCount, 'hours').subtract(1, 'seconds');
     const endPrevDate = moment(newEnd).subtract(1, 'seconds');
-    onChange({
+    handleChange({
       ...value,
       intervalKey: getActualDateRange({
         start: newStart,
@@ -113,35 +124,6 @@ const InputDateRange = props => {
     toggleOff();
   };
 
-  const absData = useMemo(
-    () => ({
-      body: OpenedPart,
-      props: {
-        ...props,
-        key: `${actualValues.start}-${actualValues.end}-${actualValues.intervalKey}-${current}-${isCompare}`,
-        actualValues,
-        current,
-        setCurrent,
-        isCompare,
-        setIsCompare,
-        toggleOff,
-        onChange
-      },
-      clickOutsideCallback: () => toggleOff(),
-      top: internalContainerRef.current?.getBoundingClientRect()?.bottom || 0,
-      left: internalContainerRef.current?.getBoundingClientRect()?.left || 0
-    }),
-    [isToggled, value, actualValues, current, isCompare]
-  );
-
-  useEffect(() => {
-    if (current && isUseAbs && absTooltip) onChange(current, 'absTooltip/props/current');
-  }, [current]);
-
-  useEffect(() => {
-    if (isUseAbs) onChange(isToggled ? absData : null, 'absTooltip');
-  }, [isToggled]);
-
   return (
     <div
       ref={internalContainerRef}
@@ -154,7 +136,12 @@ const InputDateRange = props => {
       })}
     >
       <span className="date-range-input__label">{label}</span>
-      <div className="date-range-input__wraper" ref={ref} onMouseEnter={isHoverable && toggleOn} onMouseLeave={isHoverable && toggleOff}>
+      <div
+        className="date-range-input__wraper"
+        ref={ref}
+        onMouseEnter={isHoverable ? toggleOn : () => null}
+        onMouseLeave={isHoverable ? toggleOff : () => null}
+      >
         <div
           className={cn('date-range-input__absolut-wraper', {
             'date-range-input__absolut-wraper_right-position': isOptionsRight
@@ -164,13 +151,6 @@ const InputDateRange = props => {
             <button
               id={id}
               className={cn('date-range-input__toggle-button')}
-              // className={cn(
-              //     'date-range-input__toggle-button',
-              //     { 'form-select__input--disabled': disabled },
-              //     { 'form-select__input--opened': isToggled },
-              //     { 'form-select__input--focused': isToggled },
-              //     className,
-              // )}
               disabled={disabled}
               onClick={!disabled && !isHoverable ? toggle : undefined}
             >
@@ -221,7 +201,7 @@ const InputDateRange = props => {
               isCompare={isCompare}
               setIsCompare={setIsCompare}
               toggleOff={toggleOff}
-              onChange={onChange}
+              onChange={handleChange}
             />
           )}
         </div>