npm - @alfalab/core-components - Versions diffs - 47.20.0-beta.1 → 47.20.0-beta.3 - Mend

@alfalab/core-components 47.20.0-beta.1 → 47.20.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (825) hide show

package/calendar/esm/shared/index.js CHANGED Viewed

@@ -15,7 +15,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/esm/useCalendar.js CHANGED Viewed

@@ -19,7 +19,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/esm/useRange.js CHANGED Viewed

@@ -15,7 +15,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/esm/utils.d.ts CHANGED Viewed

@@ -101,6 +101,4 @@ declare function isRangeValue(value: CalendarProps['value']): value is {
     dateFrom?: number | undefined;
     dateTo?: number | undefined;
 };
-declare const getMonthStartTimestamp: (date: Date) => number;
-declare const getMonthEndTimestamp: (date: Date) => number;
-export { DAYS_IN_WEEK, MONTHS_IN_YEAR, SUNDAY_INDEX, DATE_FORMAT, NATIVE_DATE_FORMAT, WEEKDAYS, MONTHS, russianWeekDay, generateWeeks, generateMonths, generateYears, buildDay, buildMonth, limitDate, dateInLimits, monthName, dateArrayToHashTable, addonArrayToHashTable, getSelectionRange, modifyDateByShift, simulateTab, formatDate, parseDateString, getCalendarMobileTestIds, isRangeValue, getMonthStartTimestamp, getMonthEndTimestamp };
+export { DAYS_IN_WEEK, MONTHS_IN_YEAR, SUNDAY_INDEX, DATE_FORMAT, NATIVE_DATE_FORMAT, WEEKDAYS, MONTHS, russianWeekDay, generateWeeks, generateMonths, generateYears, buildDay, buildMonth, limitDate, dateInLimits, monthName, dateArrayToHashTable, addonArrayToHashTable, getSelectionRange, modifyDateByShift, simulateTab, formatDate, parseDateString, getCalendarMobileTestIds, isRangeValue };

package/calendar/esm/utils.js CHANGED Viewed

@@ -10,7 +10,6 @@ import format from 'date-fns/format';
 import isAfter from 'date-fns/isAfter';
 import isBefore from 'date-fns/isBefore';
 import isSameDay from 'date-fns/isSameDay';
-import isThisMonth from 'date-fns/isThisMonth';
 import lastDayOfMonth from 'date-fns/lastDayOfMonth';
 import max from 'date-fns/max';
 import min from 'date-fns/min';
@@ -228,9 +227,5 @@ function getCalendarMobileTestIds(dataTestId) {
 function isRangeValue(value) {
     return Boolean(value) && typeof value === 'object';
 }
-var getMonthStartTimestamp = function (date) { return startOfMonth(date).getTime(); };
-var getMonthEndTimestamp = function (date) {
-    return isThisMonth(date) ? startOfDay(new Date()).getTime() : lastDayOfMonth(date).getTime();
-};
-export { DATE_FORMAT, DAYS_IN_WEEK, MONTHS, MONTHS_IN_YEAR, NATIVE_DATE_FORMAT, SUNDAY_INDEX, WEEKDAYS, addonArrayToHashTable, buildDay, buildMonth, dateArrayToHashTable, dateInLimits, formatDate, generateMonths, generateWeeks, generateYears, getCalendarMobileTestIds, getMonthEndTimestamp, getMonthStartTimestamp, getSelectionRange, isRangeValue, limitDate, modifyDateByShift, monthName, parseDateString, russianWeekDay, simulateTab };
+export { DATE_FORMAT, DAYS_IN_WEEK, MONTHS, MONTHS_IN_YEAR, NATIVE_DATE_FORMAT, SUNDAY_INDEX, WEEKDAYS, addonArrayToHashTable, buildDay, buildMonth, dateArrayToHashTable, dateInLimits, formatDate, generateMonths, generateWeeks, generateYears, getCalendarMobileTestIds, getSelectionRange, isRangeValue, limitDate, modifyDateByShift, monthName, parseDateString, russianWeekDay, simulateTab };

package/calendar/modern/Component.responsive.js CHANGED Viewed

@@ -9,7 +9,10 @@ import '@juggle/resize-observer';
 import 'classnames';
 import 'date-fns/endOfDay';
 import 'date-fns/isAfter';
+import 'date-fns/isSameDay';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
+import 'date-fns/lastDayOfMonth';
 import 'date-fns/startOfDay';
 import 'date-fns/startOfMonth';
 import '../../button/modern/mobile';
@@ -18,7 +21,6 @@ import '../../typography/modern';
 import './useCalendar.js';
 import 'date-fns/addMonths';
 import 'date-fns/addYears';
-import 'date-fns/isSameDay';
 import 'date-fns/isSameYear';
 import 'date-fns/setYear';
 import 'date-fns/subYears';
@@ -31,8 +33,6 @@ import 'date-fns/endOfWeek';
 import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';

package/calendar/modern/components/calendar-mobile/Component.js CHANGED Viewed

@@ -5,7 +5,10 @@ import { ResizeObserver } from '@juggle/resize-observer';
 import cn from 'classnames';
 import endOfDay from 'date-fns/endOfDay';
 import isAfter from 'date-fns/isAfter';
+import isSameDay from 'date-fns/isSameDay';
 import isSameMonth from 'date-fns/isSameMonth';
+import isThisMonth from 'date-fns/isThisMonth';
+import lastDayOfMonth from 'date-fns/lastDayOfMonth';
 import startOfDay from 'date-fns/startOfDay';
 import startOfMonth from 'date-fns/startOfMonth';
 import { ButtonMobile } from '../../../../button/modern/mobile';
@@ -15,7 +18,7 @@ import { Typography } from '../../../../typography/modern';
 import { CalendarDesktop } from '../../desktop/Component.desktop.js';
 import { useCalendar } from '../../useCalendar.js';
 import { useRange } from '../../useRange.js';
-import { limitDate, dateArrayToHashTable, addonArrayToHashTable, generateMonths, generateWeeks, monthName, WEEKDAYS, isRangeValue, getMonthStartTimestamp, getMonthEndTimestamp } from '../../utils.js';
+import { limitDate, dateArrayToHashTable, addonArrayToHashTable, generateMonths, generateWeeks, monthName, WEEKDAYS, isRangeValue } from '../../utils.js';
 import { DaysTable } from '../days-table/Component.js';
 import '@alfalab/hooks';
 import '../header/Component.js';
@@ -24,7 +27,6 @@ import '@alfalab/icons-glyph/ChevronDownCompactSIcon';
 import '../select-button/Component.js';
 import '../../../../button/modern/desktop';
 import '../months-table/Component.js';
-import 'date-fns/isThisMonth';
 import '../period-slider/Component.js';
 import 'date-fns/endOfWeek';
 import 'date-fns/startOfWeek';
@@ -49,7 +51,6 @@ import 'date-fns/startOfYear';
 import '../years-table/Component.js';
 import 'date-fns/isSameYear';
 import 'date-fns/isThisYear';
-import 'date-fns/isSameDay';
 import 'date-fns/setYear';
 import 'date-fns/subYears';
 import '../../usePeriod.js';
@@ -58,7 +59,6 @@ import 'date-fns/eachMonthOfInterval';
 import 'date-fns/eachYearOfInterval';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';
@@ -153,48 +153,43 @@ const CalendarMonthOnlyView = ({ value, mode = 'single', rangeBehavior = 'clarif
         const date = range.value || range.selectedFrom || activeMonth.getTime() || Date.now();
         return activeMonths.findIndex((m) => isSameMonth(date, m.date));
     }, [range.value, range.selectedFrom, activeMonth, activeMonths]);
+    // заголовок должен становиться активным если выбран весь доступный период в месяце
     const isMonthActive = (currentMonthIndex) => {
-        if (!value || !isRangeValue(value) || !value.dateFrom || !value.dateTo) {
-            return false;
+        if (value && isRangeValue(value)) {
+            const { date: initialMonthDate } = activeMonths[initialMonthIndex];
+            const { date: currentMonthDate } = activeMonths[currentMonthIndex];
+            const firstAvailableDayOfMonth = startOfMonth(initialMonthDate).getTime();
+            /**
+             * последний доступный день месяца в timestamp
+             * представлен в виде последнего календарного дня, либо в виде текущей даты для актуального месяца
+             */
+            const lastAvailableDayOfMonth = isThisMonth(initialMonthDate)
+                ? startOfDay(new Date()).getTime()
+                : lastDayOfMonth(initialMonthDate).getTime();
+            const { dateFrom, dateTo } = value;
+            if (dateFrom &&
+                dateTo &&
+                isSameMonth(initialMonthDate, currentMonthDate) &&
+                isSameDay(firstAvailableDayOfMonth, dateFrom) &&
+                isSameDay(lastAvailableDayOfMonth, dateTo)) {
+                return true;
+            }
         }
-        const { dateFrom, dateTo } = value;
-        const { date: currentMonthDate } = activeMonths[currentMonthIndex];
-        const monthStartTimestamp = getMonthStartTimestamp(currentMonthDate);
-        const monthEndTimestamp = getMonthEndTimestamp(currentMonthDate);
-        // Проверяем, что выбранный диапазон полностью покрывает месяц
-        return dateFrom <= monthStartTimestamp && dateTo >= monthEndTimestamp;
+        return false;
     };
     const handleClickMonthLabel = (index) => {
-        if (!onChange)
-            return;
-        const { date } = activeMonths[index];
-        const clickedMonthStartTimestamp = getMonthStartTimestamp(date);
-        const clickedMonthEndTimestamp = getMonthEndTimestamp(date);
-        if (!value || !isRangeValue(value) || !value.dateFrom || !value.dateTo) {
-            onChange(clickedMonthStartTimestamp, clickedMonthEndTimestamp);
-            return;
-        }
-        const { dateFrom, dateTo } = value;
-        const selectedRangeStartDate = new Date(dateFrom);
-        const selectedRangeEndDate = new Date(dateTo);
-        const selectedRangeStartTimestamp = getMonthStartTimestamp(selectedRangeStartDate);
-        const selectedRangeEndTimestamp = getMonthEndTimestamp(selectedRangeEndDate);
-        const isSingleMonthSelected = isSameMonth(selectedRangeStartDate, selectedRangeEndDate) &&
-            dateFrom <= selectedRangeStartTimestamp &&
-            dateTo >= selectedRangeEndTimestamp;
-        const isSameMonthClicked = isSameMonth(selectedRangeStartDate, date);
-        const isClickedMonthInsideRange = clickedMonthEndTimestamp >= selectedRangeStartTimestamp &&
-            clickedMonthStartTimestamp <= selectedRangeEndTimestamp;
-        if (isSingleMonthSelected && isSameMonthClicked) {
-            onChange();
-        }
-        else if (isClickedMonthInsideRange) {
-            onChange(clickedMonthStartTimestamp, clickedMonthEndTimestamp);
-        }
-        else {
-            const newDateFrom = Math.min(selectedRangeStartTimestamp, clickedMonthStartTimestamp);
-            const newDateTo = Math.max(selectedRangeEndTimestamp, clickedMonthEndTimestamp);
-            onChange(newDateFrom, newDateTo);
+        if (onChange) {
+            const { date } = activeMonths[index];
+            const firstAvailableDayOfMonth = startOfMonth(date).getTime();
+            const lastAvailableDayOfMonth = isThisMonth(date)
+                ? startOfDay(new Date()).getTime()
+                : lastDayOfMonth(date).getTime();
+            if (isMonthActive(index)) {
+                onChange();
+            }
+            else {
+                onChange(firstAvailableDayOfMonth, lastAvailableDayOfMonth);
+            }
         }
     };
     const getMonthLabel = (index, isClickableMonth) => {

package/calendar/modern/components/calendar-mobile/index.js CHANGED Viewed

@@ -6,7 +6,10 @@ import '@juggle/resize-observer';
 import 'classnames';
 import 'date-fns/endOfDay';
 import 'date-fns/isAfter';
+import 'date-fns/isSameDay';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
+import 'date-fns/lastDayOfMonth';
 import 'date-fns/startOfDay';
 import 'date-fns/startOfMonth';
 import '../../../../button/modern/mobile';
@@ -19,7 +22,6 @@ import '../days-table/Component.js';
 import 'react-transition-group';
 import 'date-fns/isEqual';
 import 'date-fns/isLastDayOfMonth';
-import 'date-fns/isSameDay';
 import 'date-fns/isToday';
 import 'date-fns/isWithinInterval';
 import '../../../../button/modern/desktop';
@@ -33,8 +35,6 @@ import 'date-fns/endOfWeek';
 import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';

package/calendar/modern/components/days-table/Component.js CHANGED Viewed

@@ -21,7 +21,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/components/days-table/index.js CHANGED Viewed

@@ -22,7 +22,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/components/month-year-header/Component.js CHANGED Viewed

@@ -15,7 +15,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/components/month-year-header/index.js CHANGED Viewed

@@ -15,7 +15,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/components/period-slider/Component.js CHANGED Viewed

@@ -19,7 +19,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/components/period-slider/index.js CHANGED Viewed

@@ -20,7 +20,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/components/period-slider/utils.js CHANGED Viewed

@@ -25,7 +25,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/desktop/index.js CHANGED Viewed

@@ -25,7 +25,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
@@ -40,6 +39,7 @@ import '@alfalab/icons-glyph/ChevronDownCompactSIcon';
 import '../components/select-button/Component.js';
 import '../components/months-table/Component.js';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
 import '../components/period-slider/Component.js';
 import '../../../icon-button/modern';
 import '@alfalab/icons-glyph/ChevronBackMIcon';

package/calendar/modern/index.js CHANGED Viewed

@@ -9,7 +9,10 @@ import '@juggle/resize-observer';
 import 'classnames';
 import 'date-fns/endOfDay';
 import 'date-fns/isAfter';
+import 'date-fns/isSameDay';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
+import 'date-fns/lastDayOfMonth';
 import 'date-fns/startOfDay';
 import 'date-fns/startOfMonth';
 import '../../button/modern/mobile';
@@ -21,7 +24,6 @@ import './components/days-table/Component.js';
 import 'react-transition-group';
 import 'date-fns/isEqual';
 import 'date-fns/isLastDayOfMonth';
-import 'date-fns/isSameDay';
 import 'date-fns/isToday';
 import 'date-fns/isWithinInterval';
 import '../../button/modern/desktop';
@@ -35,8 +37,6 @@ import 'date-fns/endOfWeek';
 import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';

package/calendar/modern/mobile/index.js CHANGED Viewed

@@ -6,7 +6,10 @@ import '@juggle/resize-observer';
 import 'classnames';
 import 'date-fns/endOfDay';
 import 'date-fns/isAfter';
+import 'date-fns/isSameDay';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
+import 'date-fns/lastDayOfMonth';
 import 'date-fns/startOfDay';
 import 'date-fns/startOfMonth';
 import '../../../button/modern/mobile';
@@ -19,7 +22,6 @@ import '../components/days-table/Component.js';
 import 'react-transition-group';
 import 'date-fns/isEqual';
 import 'date-fns/isLastDayOfMonth';
-import 'date-fns/isSameDay';
 import 'date-fns/isToday';
 import 'date-fns/isWithinInterval';
 import '../../../button/modern/desktop';
@@ -33,8 +35,6 @@ import 'date-fns/endOfWeek';
 import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';

package/calendar/modern/shared/index.js CHANGED Viewed

@@ -15,7 +15,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/useCalendar.js CHANGED Viewed

@@ -19,7 +19,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/useRange.js CHANGED Viewed

@@ -15,7 +15,6 @@ import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
 import 'date-fns/isSameDay';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/modern/utils.d.ts CHANGED Viewed

@@ -101,6 +101,4 @@ declare function isRangeValue(value: CalendarProps['value']): value is {
     dateFrom?: number | undefined;
     dateTo?: number | undefined;
 };
-declare const getMonthStartTimestamp: (date: Date) => number;
-declare const getMonthEndTimestamp: (date: Date) => number;
-export { DAYS_IN_WEEK, MONTHS_IN_YEAR, SUNDAY_INDEX, DATE_FORMAT, NATIVE_DATE_FORMAT, WEEKDAYS, MONTHS, russianWeekDay, generateWeeks, generateMonths, generateYears, buildDay, buildMonth, limitDate, dateInLimits, monthName, dateArrayToHashTable, addonArrayToHashTable, getSelectionRange, modifyDateByShift, simulateTab, formatDate, parseDateString, getCalendarMobileTestIds, isRangeValue, getMonthStartTimestamp, getMonthEndTimestamp };
+export { DAYS_IN_WEEK, MONTHS_IN_YEAR, SUNDAY_INDEX, DATE_FORMAT, NATIVE_DATE_FORMAT, WEEKDAYS, MONTHS, russianWeekDay, generateWeeks, generateMonths, generateYears, buildDay, buildMonth, limitDate, dateInLimits, monthName, dateArrayToHashTable, addonArrayToHashTable, getSelectionRange, modifyDateByShift, simulateTab, formatDate, parseDateString, getCalendarMobileTestIds, isRangeValue };

package/calendar/modern/utils.js CHANGED Viewed

@@ -10,7 +10,6 @@ import format from 'date-fns/format';
 import isAfter from 'date-fns/isAfter';
 import isBefore from 'date-fns/isBefore';
 import isSameDay from 'date-fns/isSameDay';
-import isThisMonth from 'date-fns/isThisMonth';
 import lastDayOfMonth from 'date-fns/lastDayOfMonth';
 import max from 'date-fns/max';
 import min from 'date-fns/min';
@@ -219,7 +218,5 @@ function getCalendarMobileTestIds(dataTestId) {
 function isRangeValue(value) {
     return Boolean(value) && typeof value === 'object';
 }
-const getMonthStartTimestamp = (date) => startOfMonth(date).getTime();
-const getMonthEndTimestamp = (date) => isThisMonth(date) ? startOfDay(new Date()).getTime() : lastDayOfMonth(date).getTime();
-export { DATE_FORMAT, DAYS_IN_WEEK, MONTHS, MONTHS_IN_YEAR, NATIVE_DATE_FORMAT, SUNDAY_INDEX, WEEKDAYS, addonArrayToHashTable, buildDay, buildMonth, dateArrayToHashTable, dateInLimits, formatDate, generateMonths, generateWeeks, generateYears, getCalendarMobileTestIds, getMonthEndTimestamp, getMonthStartTimestamp, getSelectionRange, isRangeValue, limitDate, modifyDateByShift, monthName, parseDateString, russianWeekDay, simulateTab };
+export { DATE_FORMAT, DAYS_IN_WEEK, MONTHS, MONTHS_IN_YEAR, NATIVE_DATE_FORMAT, SUNDAY_INDEX, WEEKDAYS, addonArrayToHashTable, buildDay, buildMonth, dateArrayToHashTable, dateInLimits, formatDate, generateMonths, generateWeeks, generateYears, getCalendarMobileTestIds, getSelectionRange, isRangeValue, limitDate, modifyDateByShift, monthName, parseDateString, russianWeekDay, simulateTab };

package/calendar/moderncssm/Component.responsive.js CHANGED Viewed

@@ -9,7 +9,10 @@ import '@juggle/resize-observer';
 import 'classnames';
 import 'date-fns/endOfDay';
 import 'date-fns/isAfter';
+import 'date-fns/isSameDay';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
+import 'date-fns/lastDayOfMonth';
 import 'date-fns/startOfDay';
 import 'date-fns/startOfMonth';
 import '../../button/moderncssm/mobile';
@@ -18,7 +21,6 @@ import '../../typography/moderncssm';
 import './useCalendar.js';
 import 'date-fns/addMonths';
 import 'date-fns/addYears';
-import 'date-fns/isSameDay';
 import 'date-fns/isSameYear';
 import 'date-fns/setYear';
 import 'date-fns/subYears';
@@ -31,8 +33,6 @@ import 'date-fns/endOfWeek';
 import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';

package/calendar/moderncssm/components/calendar-mobile/Component.js CHANGED Viewed

@@ -5,7 +5,10 @@ import { ResizeObserver } from '@juggle/resize-observer';
 import cn from 'classnames';
 import endOfDay from 'date-fns/endOfDay';
 import isAfter from 'date-fns/isAfter';
+import isSameDay from 'date-fns/isSameDay';
 import isSameMonth from 'date-fns/isSameMonth';
+import isThisMonth from 'date-fns/isThisMonth';
+import lastDayOfMonth from 'date-fns/lastDayOfMonth';
 import startOfDay from 'date-fns/startOfDay';
 import startOfMonth from 'date-fns/startOfMonth';
 import { ButtonMobile } from '../../../../button/moderncssm/mobile';
@@ -15,7 +18,7 @@ import { Typography } from '../../../../typography/moderncssm';
 import { CalendarDesktop } from '../../desktop/Component.desktop.js';
 import { useCalendar } from '../../useCalendar.js';
 import { useRange } from '../../useRange.js';
-import { limitDate, dateArrayToHashTable, addonArrayToHashTable, generateMonths, generateWeeks, monthName, WEEKDAYS, isRangeValue, getMonthStartTimestamp, getMonthEndTimestamp } from '../../utils.js';
+import { limitDate, dateArrayToHashTable, addonArrayToHashTable, generateMonths, generateWeeks, monthName, WEEKDAYS, isRangeValue } from '../../utils.js';
 import { DaysTable } from '../days-table/Component.js';
 import backdropTransitionStyles from './backdrop-transitions.module.css';
 import styles from './index.module.css';
@@ -30,7 +33,6 @@ import '../../../../button/moderncssm/desktop';
 import '../select-button/index.module.css';
 import '../month-year-header/index.module.css';
 import '../months-table/Component.js';
-import 'date-fns/isThisMonth';
 import '../months-table/index.module.css';
 import '../period-slider/Component.js';
 import 'date-fns/endOfWeek';
@@ -59,7 +61,6 @@ import 'date-fns/isSameYear';
 import 'date-fns/isThisYear';
 import '../years-table/index.module.css';
 import '../../desktop/desktop.module.css';
-import 'date-fns/isSameDay';
 import 'date-fns/setYear';
 import 'date-fns/subYears';
 import '../../usePeriod.js';
@@ -68,7 +69,6 @@ import 'date-fns/eachMonthOfInterval';
 import 'date-fns/eachYearOfInterval';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';
@@ -155,48 +155,43 @@ const CalendarMonthOnlyView = ({ value, mode = 'single', rangeBehavior = 'clarif
         const date = range.value || range.selectedFrom || activeMonth.getTime() || Date.now();
         return activeMonths.findIndex((m) => isSameMonth(date, m.date));
     }, [range.value, range.selectedFrom, activeMonth, activeMonths]);
+    // заголовок должен становиться активным если выбран весь доступный период в месяце
     const isMonthActive = (currentMonthIndex) => {
-        if (!value || !isRangeValue(value) || !value.dateFrom || !value.dateTo) {
-            return false;
+        if (value && isRangeValue(value)) {
+            const { date: initialMonthDate } = activeMonths[initialMonthIndex];
+            const { date: currentMonthDate } = activeMonths[currentMonthIndex];
+            const firstAvailableDayOfMonth = startOfMonth(initialMonthDate).getTime();
+            /**
+             * последний доступный день месяца в timestamp
+             * представлен в виде последнего календарного дня, либо в виде текущей даты для актуального месяца
+             */
+            const lastAvailableDayOfMonth = isThisMonth(initialMonthDate)
+                ? startOfDay(new Date()).getTime()
+                : lastDayOfMonth(initialMonthDate).getTime();
+            const { dateFrom, dateTo } = value;
+            if (dateFrom &&
+                dateTo &&
+                isSameMonth(initialMonthDate, currentMonthDate) &&
+                isSameDay(firstAvailableDayOfMonth, dateFrom) &&
+                isSameDay(lastAvailableDayOfMonth, dateTo)) {
+                return true;
+            }
         }
-        const { dateFrom, dateTo } = value;
-        const { date: currentMonthDate } = activeMonths[currentMonthIndex];
-        const monthStartTimestamp = getMonthStartTimestamp(currentMonthDate);
-        const monthEndTimestamp = getMonthEndTimestamp(currentMonthDate);
-        // Проверяем, что выбранный диапазон полностью покрывает месяц
-        return dateFrom <= monthStartTimestamp && dateTo >= monthEndTimestamp;
+        return false;
     };
     const handleClickMonthLabel = (index) => {
-        if (!onChange)
-            return;
-        const { date } = activeMonths[index];
-        const clickedMonthStartTimestamp = getMonthStartTimestamp(date);
-        const clickedMonthEndTimestamp = getMonthEndTimestamp(date);
-        if (!value || !isRangeValue(value) || !value.dateFrom || !value.dateTo) {
-            onChange(clickedMonthStartTimestamp, clickedMonthEndTimestamp);
-            return;
-        }
-        const { dateFrom, dateTo } = value;
-        const selectedRangeStartDate = new Date(dateFrom);
-        const selectedRangeEndDate = new Date(dateTo);
-        const selectedRangeStartTimestamp = getMonthStartTimestamp(selectedRangeStartDate);
-        const selectedRangeEndTimestamp = getMonthEndTimestamp(selectedRangeEndDate);
-        const isSingleMonthSelected = isSameMonth(selectedRangeStartDate, selectedRangeEndDate) &&
-            dateFrom <= selectedRangeStartTimestamp &&
-            dateTo >= selectedRangeEndTimestamp;
-        const isSameMonthClicked = isSameMonth(selectedRangeStartDate, date);
-        const isClickedMonthInsideRange = clickedMonthEndTimestamp >= selectedRangeStartTimestamp &&
-            clickedMonthStartTimestamp <= selectedRangeEndTimestamp;
-        if (isSingleMonthSelected && isSameMonthClicked) {
-            onChange();
-        }
-        else if (isClickedMonthInsideRange) {
-            onChange(clickedMonthStartTimestamp, clickedMonthEndTimestamp);
-        }
-        else {
-            const newDateFrom = Math.min(selectedRangeStartTimestamp, clickedMonthStartTimestamp);
-            const newDateTo = Math.max(selectedRangeEndTimestamp, clickedMonthEndTimestamp);
-            onChange(newDateFrom, newDateTo);
+        if (onChange) {
+            const { date } = activeMonths[index];
+            const firstAvailableDayOfMonth = startOfMonth(date).getTime();
+            const lastAvailableDayOfMonth = isThisMonth(date)
+                ? startOfDay(new Date()).getTime()
+                : lastDayOfMonth(date).getTime();
+            if (isMonthActive(index)) {
+                onChange();
+            }
+            else {
+                onChange(firstAvailableDayOfMonth, lastAvailableDayOfMonth);
+            }
         }
     };
     const getMonthLabel = (index, isClickableMonth) => {

package/calendar/moderncssm/components/calendar-mobile/index.js CHANGED Viewed

@@ -6,7 +6,10 @@ import '@juggle/resize-observer';
 import 'classnames';
 import 'date-fns/endOfDay';
 import 'date-fns/isAfter';
+import 'date-fns/isSameDay';
 import 'date-fns/isSameMonth';
+import 'date-fns/isThisMonth';
+import 'date-fns/lastDayOfMonth';
 import 'date-fns/startOfDay';
 import 'date-fns/startOfMonth';
 import '../../../../button/moderncssm/mobile';
@@ -19,7 +22,6 @@ import '../days-table/Component.js';
 import 'react-transition-group';
 import 'date-fns/isEqual';
 import 'date-fns/isLastDayOfMonth';
-import 'date-fns/isSameDay';
 import 'date-fns/isToday';
 import 'date-fns/isWithinInterval';
 import '../../../../button/moderncssm/desktop';
@@ -33,8 +35,6 @@ import 'date-fns/endOfWeek';
 import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
-import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';
 import 'date-fns/parse';

package/calendar/moderncssm/components/days-table/Component.js CHANGED Viewed

@@ -22,7 +22,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';

package/calendar/moderncssm/components/days-table/index.js CHANGED Viewed

@@ -22,7 +22,6 @@ import 'date-fns/endOfYear';
 import 'date-fns/format';
 import 'date-fns/isAfter';
 import 'date-fns/isBefore';
-import 'date-fns/isThisMonth';
 import 'date-fns/lastDayOfMonth';
 import 'date-fns/max';
 import 'date-fns/min';