intelicoreact 0.0.61 → 0.0.65

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

@@ -7,228 +7,235 @@ 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,
-    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 Range = () => {
-    const SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
-    const { start, end } = actualValues;
-    if (!start || !end) return null;
-
-    const startTime = moment(start).format('HH:mm');
-    const endTime = moment(end).format('HH:mm');
-
-    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
-      });
+    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 Range = () => {
+        const  SYMBOLS_QUANTITY_IF_TIME_ADDED = 13;
+        const { start, end } = actualValues;
+        if (!start || !end) return null;
+
+        const startTime = moment(start).format('HH:mm');
+        const endTime = moment(end).format('HH:mm');
+
+        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>
 
-    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');
-    onChange({
-      ...value,
-      intervalKey: getActualDateRange({
-        start: newStart,
-        end: newEnd
-      })?.intervalKey,
-      start: newStart,
-      end: newEnd,
-      startPrevDate,
-      endPrevDate
-    });
-  };
-
-  const handleArrowClick = type => {
-    slideInterval(type === 'right' ? 'forward' : 'back');
-    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}
-      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} onMouseLeave={isHoverable && toggleOff}>
+
+    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 handleArrowClick = type => {
+        slideInterval(type === 'right' ? 'forward' : 'back');
+        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
-          className={cn('date-range-input__absolut-wraper', {
-            'date-range-input__absolut-wraper_right-position': isOptionsRight
-          })}
+            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,
+            })}
         >
-          <div className={cn('date-range-input__static-part')}>
-            <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}
+            <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__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 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>
-              )}
-            </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={onChange}
-            />
-          )}
+            </div>
+            {error && <span className="date-range-input__error-block">{error}</span>}
         </div>
-      </div>
-      {error && <span className="date-range-input__error-block">{error}</span>}
-    </div>
-  );
+    );
 };
 
 export default React.memo(InputDateRange);

package/src/Atomic/FormElements/InputDateRange/InputDateRange.scss

@@ -6,6 +6,7 @@
   --calendar-range-point-color: #6b81dd;
   --font-size: 12px;
   --line-height: 20px;
+  --border-radius: 4px;
 }
 
 .date-range-input {
@@ -63,7 +64,7 @@
     box-sizing: border-box;
     width: 100%;
     height: var(--input-height);
-    border-radius: 4px;
+    border-radius: var(--border-radius);
 
     display: flex;
     flex-flow: row nowrap;
@@ -200,7 +201,7 @@
     justify-content: flex-start;
     align-items: stretch;
     border: 1px solid var(--border-color);
-    border-radius: 4px;
+    border-radius: var(--border-radius);
     background: #FFFFFF;
 
     &_right-position-once-element {
@@ -297,7 +298,7 @@
       &.input__wrap {
         box-sizing: border-box;
         box-shadow: none;
-        border-radius: 4px;
+        border-radius: var(--border-radius);
 
         &_focus {
           border: 1px solid blue;
@@ -329,7 +330,7 @@
   &__hour-select-input {
     width: 70px;
     height: fit-content;
-    border-radius: 4px;
+    border-radius: var(--border-radius);
     
     &>.dropdown__trigger {
       width: 100%;
@@ -507,7 +508,7 @@
     
         &--prev-range-end {
           background: #E2E5EC;
-          border-radius: 4px;
+          border-radius: var(--border-radius);
         }
     
         &--prev-range-inside {
@@ -530,7 +531,7 @@
     box-sizing: border-box;
     width: 100%;
     padding: 8px 16px;
-    border-radius: 0 0 16px 0;
+    border-radius: 0 0 var(--border-radius) 0;
     border: none;
 
     display: flex;

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

@@ -1,5 +1,6 @@
-import React, { useState } from 'react';
+import React, { /*useEffect,*/ useState } from 'react';
 import InputDateRange from './InputDateRange';
+import Table from '../Table/Table';
 
 global.lng = 'en';
 
@@ -16,18 +17,107 @@ export default {
   }
 };
 
+const tableData = {
+  header: [
+    { id: 1, label: 'state' },
+    { id: 2, label: 'Tags' },
+    { id: 3, label: 'status' },
+    { id: 4, label: 'loanAmountApproved' },
+    { id: 5, label: 'loanAmountRejected' },
+    { id: 6, label: 'approveRate' },
+    { id: 7, label: 'actions', type: 'actions' }
+  ],
+  rows: [
+    {
+      id: 1,
+      link: { label: 'CA', link: '#s' },
+      tags: [{ label: 'Label 1' }],
+      status: { value: '90', status: 'active' },
+      loanAmountApproved: { value: '$70,000' },
+      loanAmountRejected: { value: '$30,000' },
+      approveRate: { value: '70%' }
+    },
+    {
+      id: 2,
+      link: { label: 'NY', link: '#s' },
+      advancedTags: [
+        {
+          labelLeft: 'home',
+          labelRight: 'hoods',
+          active: 3,
+          pause: 1,
+          merchants: 5
+        },
+        {
+          labelRight: 'jewelry',
+          active: 3,
+          pause: 1,
+          merchants: 5
+        },
+        {
+          labelLeft: 'home',
+          labelRight: 'improvement',
+          active: 0,
+          pause: 0,
+          warnLeft: true,
+          warnLeftMsg: 'landerNotIncluded',
+          warnRightMsg: 'noMerchants'
+        },
+        {
+          labelLeft: 'home',
+          labelRight: 'hoods',
+          active: 3,
+          pause: 1,
+          merchants: 5
+        },
+        {
+          labelRight: 'jewelry',
+          active: 3,
+          pause: 1,
+          merchants: 5
+        }
+      ],
+      status: { label: 'Active', className: 'color--green-haze' },
+      loanAmountApproved: { value: '$3,000' },
+      loanAmountRejected: { value: '$7,000' },
+      approveRate: { value: '30%' }
+    },
+    {
+      id: 3,
+      link: { label: 'NH', link: '#s' },
+      tags: [{ label: 'Label 1' }, { label: 'Label 2' }, { label: 'Label 3' }],
+      status: { status: 'error' },
+      loanAmountApproved: { value: '$70,000' },
+      loanAmountRejected: { value: '$30,000' },
+      approveRate: { value: '70%' }
+    }
+  ]
+};
+
 const Template = args => {
-  const { dateRange, ...restOfProps } = args;
-  const [value, setValue] = useState(dateRange);
-
-  // return <InputDateRange {...restOfProps} value={value} onChange={setValue} />;
-  return (
-    <div>
-      <div className="mb20">
-        <InputDateRange {...restOfProps} value={value} onChange={setValue} />
+    const { dateRange, ...restOfProps } = args;
+    const [value, setValue] = useState(dateRange);
+
+    const [state, setState] = useState(tableData);
+
+    const rowsWithActions = state?.rows?.map(row => ({
+      ...row,
+      actions: row.isDeleted ? [{ type: 'undo' }] : [{ type: 'download' }, { type: 'edit' }, { type: 'delete' }]
+    }));
+
+    // useEffect(() => console.log(value), [value]);
+
+    // return <InputDateRange {...restOfProps} value={value} onChange={setValue} />;
+    return (
+      <div>
+        <div className="mb20">
+          <InputDateRange {...restOfProps} value={value} onChange={setValue} />
+        </div>
+        <div>
+          <Table header={state.header} rows={rowsWithActions} onChange={setState} />
+        </div>
       </div>
-    </div>
-  );
+    );
 };
 
 export const InputDateRangeTemplate = Template.bind({});
@@ -52,6 +142,7 @@ InputDateRangeTemplate.args = {
     isCompareHidden: true,
     hideArrows: false,
     isOptionsRight: false,
+    isShortWeekNames: false
     // limitRange,
     // isUseAbs,
     // absTooltip

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

@@ -40,7 +40,8 @@ const Datepicker = props => {
         isCompareHidden,
         limitRange,
         handleItemClick,
-        setActiveInterval
+        setActiveInterval,
+        isShortWeekNames
     } = props;
     const { start = null, end = null, compare = false } = values;
     const startDateInputRef = useRef(null);
@@ -362,6 +363,7 @@ const Datepicker = props => {
                         onClick={handleClick}
                         onHover={handleHover}
                         limitRange={limitRange}
+                        isShortWeekNames={isShortWeekNames}
                     />
                     <Calendar
                         className="date-picker__calendar"
@@ -374,6 +376,7 @@ const Datepicker = props => {
                         endPrevDate={endPrevDate}
                         onClick={handleClick}
                         onHover={handleHover}
+                        isShortWeekNames={isShortWeekNames}
                     />
                 </div>
             </div>