intelicoreact 0.0.65 → 0.0.73

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';
 
@@ -7,235 +7,213 @@ import { useClickOutside, useToggle, getActualDateRange, INTERVALS, ALL_TIME_KEY
 import OpenedPart from './components/OpenedPart';
 import Arrow from '../../UI/Arrow/Arrow';
 
-import './InputDateRange.scss'
+import './InputDateRange.scss';
 
 const InputDateRange = props => {
-    const {
-        txt,
-        id,
-        label,
-        className,
-        buttonsTypes,
-        value,
-        onChange = () => {},
-        error,
-        disabled,
-        isHoverable,
-        short,
-        isCompact = false,
-        // isFocused = false,
-        isIntervalsHidden = false,
-        isCompareHidden = false,
-        hideArrows = false,
-        isOptionsRight,
-        limitRange,
-        isShortWeekNames,
-        isUseAbs,
-        absTooltip,
-    } = props;
-
-    const actualValues = getActualDateRange(value);
-    const { isToggled, toggle, toggleOn, toggleOff } = useToggle(false);
-    const [current, setCurrent] = useState(actualValues?.intervalKey);
-    const [isCompare, setIsCompare] = useState(actualValues?.compare);
-
-    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;
+  const {
+    txt,
+    id,
+    label,
+    className,
+    value,
+    onChange = () => {},
+    error,
+    disabled,
+    isHoverable,
+    isCompact = false,
+    hideArrows = false,
+    isOptionsRight,
+    isUseAbs,
+  } = props;
+
+  const actualValues = getActualDateRange(value);
+  const { isToggled, toggle, toggleOn, toggleOff } = useToggle(false);
+  const [current, setCurrent] = useState(actualValues?.intervalKey);
+  const [isCompare, setIsCompare] = useState(actualValues?.compare);
+
+  const ref = !isUseAbs ? useClickOutside(toggleOff) : useRef(null);
+  const internalContainerRef = useRef(null);
+
+  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') } : {})
     };
 
-    const Range = () => {
-        const  SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
-        const { start, end } = actualValues;
-        if (!start || !end) return null;
+    onChange(formatedValue);
+    return formatedValue;
+  };
 
-        const startTime = moment(start).format('HH:mm');
-        const endTime = moment(end).format('HH:mm');
+  const [mountDate, setMD] = useState(false);
 
-        const firstPart = `${moment(start).format('ll')} ${startTime !== '00:00' ? `(${startTime})` : ''}`;
-        const secondPart = `${(endTime !== '00:00' ? moment(end) : moment(end).subtract(1, 'days')).format('ll')} ${
-            endTime !== '00:00' ? `(${endTime})` : ''
-        }`;
-
-        const getClasses = base => cn('date-range-input__range-text', {
-            'date-range-input__range-text_little': base.length > SYMBOLS_QUANTITY_IF_TIME_ADDED
-        });
-
-        return (
-            <>
-                <span className={getClasses(firstPart)}>
-                    {firstPart}
-                    {endTime === '00:00' && moment(end).isSame(moment(start).add(1, 'days'), 'day') ? '' : ` - `}
-                </span>
-                {endTime === '00:00' && moment(end).isSame(moment(start).add(1, 'days'), 'day')
-                    ? null
-                    :<span className={getClasses(secondPart)}>{secondPart}</span>
-
-                }
-            </>
-        )
+  useEffect(() => {
+    if (value && !mountDate) {
+      setMD(true);
+      handleChange({ ...value });
     }
+  }, [value]);
 
-    const slideInterval = (direction = 'forward') => {
-        const { start, end } = actualValues;
-        const intervalHoursCount = moment(end).diff(start, 'hours');
-        let newEnd, newStart;
-        const endHours = moment(end).hours();
-        const startHours = moment(start).hours();
-        if (direction === 'forward') {
-            newStart = moment(end)
-                .add(endHours === 0 ? 0 : 1, 'day')
-                .hours(startHours)
-                .toDate();
-            newEnd = moment(newStart).add(intervalHoursCount, 'hours');
-        } else {
-            newEnd = moment(start)
-                .subtract(endHours === 0 ? 0 : 1, 'day')
-                .hours(endHours)
-                .toDate();
-            newStart = moment(newEnd).subtract(intervalHoursCount, 'hours');
-        }
-        const startPrevDate = moment(newStart).subtract(intervalHoursCount, 'hours').subtract(1, 'seconds');
-        const endPrevDate = moment(newEnd).subtract(1, 'seconds');
-        handleChange({
-            ...value,
-            intervalKey: getActualDateRange({
-                start: newStart,
-                end: newEnd,
-            })?.intervalKey,
-            start: newStart,
-            end: newEnd,
-            startPrevDate,
-            endPrevDate,
-        });
-    };
+  const Range = () => {
+    const SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
+    const { start, end } = actualValues;
+    if (!start || !end) return null;
 
-    const handleArrowClick = type => {
-        slideInterval(type === 'right' ? 'forward' : 'back');
-        toggleOff();
-    };
+    const startTime = moment(start).format('HH:mm');
+    const endTime = moment(end).format('HH:mm');
 
-    // 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]);
+    const firstPart = `${moment(start).format('ll')} ${startTime !== '00:00' ? `(${startTime})` : ''}`;
+    const secondPart = `${(endTime !== '00:00' ? moment(end) : moment(end).subtract(1, 'days')).format('ll')} ${
+      endTime !== '00:00' ? `(${endTime})` : ''
+    }`;
+
+    const getClasses = base =>
+      cn('date-range-input__range-text', {
+        'date-range-input__range-text_little': base.length > SYMBOLS_QUANTITY_IF_TIME_ADDED
+      });
 
     return (
+      <>
+        <span className={getClasses(firstPart)}>
+          {firstPart}
+          {endTime === '00:00' && moment(end).isSame(moment(start).add(1, 'days'), 'day') ? '' : ` - `}
+        </span>
+        {endTime === '00:00' && moment(end).isSame(moment(start).add(1, 'days'), 'day') ? null : (
+          <span className={getClasses(secondPart)}>{secondPart}</span>
+        )}
+      </>
+    );
+  };
+
+  const slideInterval = (direction = 'forward') => {
+    const { start, end } = actualValues;
+    const intervalHoursCount = moment(end).diff(start, 'hours');
+    let newEnd;
+    let newStart;
+    const endHours = moment(end).hours();
+    const startHours = moment(start).hours();
+    if (direction === 'forward') {
+      newStart = moment(end)
+        .add(endHours === 0 ? 0 : 1, 'day')
+        .hours(startHours)
+        .toDate();
+      newEnd = moment(newStart).add(intervalHoursCount, 'hours');
+    } else {
+      newEnd = moment(start)
+        .subtract(endHours === 0 ? 0 : 1, 'day')
+        .hours(endHours)
+        .toDate();
+      newStart = moment(newEnd).subtract(intervalHoursCount, 'hours');
+    }
+    const startPrevDate = moment(newStart).subtract(intervalHoursCount, 'hours').subtract(1, 'seconds');
+    const endPrevDate = moment(newEnd).subtract(1, 'seconds');
+    handleChange({
+      ...value,
+      intervalKey: getActualDateRange({
+        start: newStart,
+        end: newEnd
+      })?.intervalKey,
+      start: newStart,
+      end: newEnd,
+      startPrevDate,
+      endPrevDate
+    });
+  };
+
+  const handleArrowClick = type => {
+    slideInterval(type === 'right' ? 'forward' : 'back');
+    toggleOff();
+  };
+
+  return (
+    <div
+      ref={internalContainerRef}
+      className={cn('date-range-input', className, {
+        'date-range-input_compact': isCompact,
+        'date-range-input_hide-arrows': hideArrows,
+        'date-range-input_focused': isToggled,
+        'date-range-input_error': error,
+        'date-range-input_disabled': disabled
+      })}
+    >
+      <span className="date-range-input__label">{label}</span>
+      <div
+        className="date-range-input__wraper"
+        ref={ref}
+        onMouseEnter={isHoverable ? toggleOn : () => null}
+        onMouseLeave={isHoverable ? toggleOff : () => null}
+      >
         <div
-            ref={internalContainerRef}
-            className={cn('date-range-input', className, {
-                'date-range-input_compact': isCompact,
-                'date-range-input_hide-arrows': hideArrows,
-                'date-range-input_focused': isToggled,
-                'date-range-input_error': error,
-                'date-range-input_disabled': disabled,
-            })}
+          className={cn('date-range-input__absolut-wraper', {
+            'date-range-input__absolut-wraper_right-position': isOptionsRight
+          })}
         >
-            <span className="date-range-input__label" >{label}</span>
-            <div
-                className="date-range-input__wraper"
-                ref={ref}
-                onMouseEnter={isHoverable && toggleOn}
-                onMouseLeave={isHoverable && toggleOff}
+          <div className={cn('date-range-input__static-part')}>
+            <button
+              id={id}
+              className={cn('date-range-input__toggle-button')}
+              disabled={disabled}
+              onClick={!disabled && !isHoverable ? toggle : undefined}
             >
-                <div className={cn('date-range-input__absolut-wraper', {
-                    'date-range-input__absolut-wraper_right-position': isOptionsRight,
-                })}>
-                    <div className={cn('date-range-input__static-part')}>
-                        <button
-                            id={id}
-                            className={cn('date-range-input__toggle-button')}
-                            disabled={disabled}
-                            onClick={!disabled && !isHoverable ? toggle : undefined}
-                        >
-                            <div className="date-range-input__interval-key">
-                                <span>
-                                    {(txt?.labels && txt.labels[actualValues?.intervalKey]) ?? (INTERVALS[actualValues?.intervalKey]?.label || CUSTOM_INTERVAL_KEY_TEXT)}
-                                </span>
-                                {current !== ALL_TIME_KEY && <span>:</span>}
-                            </div>
-                            {!isCompact && <div className={cn('date-range-input__range', {})}><Range /></div>}
-                        </button>
-                        {!isCompact && !hideArrows && (
-                            <div className={cn('date-range-input__arrows-block')}>
-                                <Arrow 
-                                    type="left" 
-                                    className="date-range-input__arrow" 
-                                    onClick={() => handleArrowClick("left")} 
-                                    disabled={disabled || actualValues?.intervalKey === ALL_TIME_KEY} 
-                                />
-                                <Arrow 
-                                    type="right" 
-                                    className="date-range-input__arrow" 
-                                    onClick={() => handleArrowClick("right")} 
-                                    disabled={
-                                        disabled || 
-                                        actualValues?.intervalKey === ALL_TIME_KEY || 
-                                        actualValues?.intervalKey === 'today' || 
-                                        moment(actualValues?.end)
-                                            .add(moment(actualValues?.end).diff(actualValues?.start, 'hours'), 'hours')
-                                            .isAfter(moment().add(1, 'day').startOf('day'))
-                                    }
-                                />
-                            </div>
-                        )}
-                    </div>
-                    {isToggled && !isUseAbs && (
-                        <OpenedPart
-                            {...props}
-                            ref={internalContainerRef}
-                            actualValues={actualValues}
-                            current={current}
-                            setCurrent={setCurrent}
-                            isCompare={isCompare}
-                            setIsCompare={setIsCompare}
-                            toggleOff={toggleOff}
-                            onChange={handleChange}
-                        />
-                    )}
+              <div className="date-range-input__interval-key">
+                <span>
+                  {(txt?.labels && txt.labels[actualValues?.intervalKey]) ??
+                    (INTERVALS[actualValues?.intervalKey]?.label || CUSTOM_INTERVAL_KEY_TEXT)}
+                </span>
+                {current !== ALL_TIME_KEY && <span>:</span>}
+              </div>
+              {!isCompact && (
+                <div className={cn('date-range-input__range', {})}>
+                  <Range />
                 </div>
-            </div>
-            {error && <span className="date-range-input__error-block">{error}</span>}
+              )}
+            </button>
+            {!isCompact && !hideArrows && (
+              <div className={cn('date-range-input__arrows-block')}>
+                <Arrow
+                  type="left"
+                  className="date-range-input__arrow"
+                  onClick={() => handleArrowClick('left')}
+                  disabled={disabled || actualValues?.intervalKey === ALL_TIME_KEY}
+                />
+                <Arrow
+                  type="right"
+                  className="date-range-input__arrow"
+                  onClick={() => handleArrowClick('right')}
+                  disabled={
+                    disabled ||
+                    actualValues?.intervalKey === ALL_TIME_KEY ||
+                    actualValues?.intervalKey === 'today' ||
+                    moment(actualValues?.end)
+                      .add(moment(actualValues?.end).diff(actualValues?.start, 'hours'), 'hours')
+                      .isAfter(moment().add(1, 'day').startOf('day'))
+                  }
+                />
+              </div>
+            )}
+          </div>
+          {isToggled && !isUseAbs && (
+            <OpenedPart
+              {...props}
+              ref={internalContainerRef}
+              actualValues={actualValues}
+              current={current}
+              setCurrent={setCurrent}
+              isCompare={isCompare}
+              setIsCompare={setIsCompare}
+              toggleOff={toggleOff}
+              onChange={handleChange}
+            />
+          )}
         </div>
-    );
+      </div>
+      {error && <span className="date-range-input__error-block">{error}</span>}
+    </div>
+  );
 };
 
 export default React.memo(InputDateRange);