intelicoreact 0.0.61 → 0.0.65

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

@@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react';
 import moment from 'moment-timezone';
 import cn from 'classnames';
 
-import {INTERVALS as intervals, CUSTOM_INTERVAL_KEY as customKey } from '../dependencies';
+import {INTERVALS as intervals, CUSTOM_INTERVAL_KEY as customKey, CUSTOM_INTERVAL_KEY_TEXT } from '../dependencies';
 
 import SelectItem from './SelectItem';
 import Datepicker from './Datepicker';
@@ -25,6 +25,7 @@ const OpenedPart = React.forwardRef((props, ref) => {
         isCompare,
         setIsCompare,
         toggleOff,
+        isShortWeekNames
     } = props;
   
     const items = isCompact ? [...Object.keys(intervals)] : [...Object.keys(intervals), customKey];
@@ -76,7 +77,7 @@ const OpenedPart = React.forwardRef((props, ref) => {
                             <SelectItem
                                 key={index}
                                 item={item}
-                                label={(txt?.labels && txt?.labels[item]) || intervals[item]?.label || item}
+                                label={(txt?.labels && txt?.labels[item]) || intervals[item]?.label || (item === customKey ? CUSTOM_INTERVAL_KEY_TEXT : item )}
                                 isActive={activeInterval === item}
                                 onItemClick={() => handleItemClick(item.value || item)}
                                 disabled={item === customKey}
@@ -103,6 +104,7 @@ const OpenedPart = React.forwardRef((props, ref) => {
                         isCompareHidden={isCompareHidden}
                         limitRange={limitRange}
                         setActiveInterval={setActiveInterval}
+                        isShortWeekNames={isShortWeekNames}
                     />
                 )}
             </div>

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

@@ -1,8 +1,6 @@
 import React from 'react';
 import cn from 'classnames';
 
-import icon from '../../../../../../assets/icons/check.svg'
-
 const SelectItem = ({ item, label, isActive, onItemClick, onMouseEnter, disabled }) => (
     <div
         className={cn(
@@ -15,7 +13,11 @@ const SelectItem = ({ item, label, isActive, onItemClick, onMouseEnter, disabled
         onMouseEnter={onMouseEnter}
         data-item={item}
     >
-        {isActive && <object data={icon} className={cn('opened-part__intervals-item-icon-active')} />}
+        {isActive && (
+            <svg className={cn('opened-part__intervals-item-icon-active')} width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M13.3333 4L5.99999 11.3333L2.66666 8" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+            </svg>
+        )}
         {label}
     </div>
 );

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

@@ -130,6 +130,14 @@ export const getActualDateRange = inputDateRange => {
         }
         return null;
     })();
+    if (actualIntervalKey === ALL_TIME_KEY) return {
+        intervalKey: ALL_TIME_KEY,
+        start: null,
+        end: null,
+        compare: inputDateRange.compare,
+        startPrevDate: null,
+        endPrevDate:null
+    };
     const actualValues = {
         // intervalKey: inputDateRange.intervalKey || customIntervalKey,
         intervalKey: actualIntervalKey || CUSTOM_INTERVAL_KEY,

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

@@ -19,7 +19,8 @@ const RangeCalendar = props => {
         onHover = () => {},
         startPrevDate,
         endPrevDate,
-        limitRange
+        limitRange,
+        isShortWeekNames
     } = props;
 
     const [days, setDays] = useState({});
@@ -100,6 +101,8 @@ const RangeCalendar = props => {
         setDate(moment(date).add(1, 'month').toDate());
     };
 
+    const getFormatedWeekName = input => isShortWeekNames ? input.charAt(0) : input;
+
     return (
         <div className={cn('range-calendar', className)}>
             <div className="range-calendar-header">
@@ -126,7 +129,7 @@ const RangeCalendar = props => {
                 {[...Array(7).keys()].map(dayOfWeek => {
                     return (
                         <div key={`day-of-week_${dayOfWeek}`} className="range-calendar__day range-calendar__day--title">
-                            {moment().weekday(dayOfWeek).format('dd').charAt(0)}
+                            {getFormatedWeekName(moment().weekday(dayOfWeek).format('dd'))}
                         </div>
                     );
                 })}