@megafon/ui-core 7.4.1 → 7.5.0

package/dist/es/components/Calendar/Calendar.js

@@ -19,7 +19,7 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 import * as React from 'react';
-import { START_DATE, END_DATE, useDatepicker, useMonth } from '@datepicker-react/hooks';
+import { START_DATE, END_DATE, useDatepicker } from '@datepicker-react/hooks';
 import { cnCreate, filterDataAttrs } from '@megafon/ui-helpers';
 import { addMonths, subMonths } from 'date-fns';
 import differenceInDays from 'date-fns/differenceInDays';
@@ -47,15 +47,6 @@ export var CalendarDirectionTypes = {
   FUTURE: 'future',
   BOTH: 'both'
 };
-var weekdayLabelFormat = function weekdayLabelFormat(date) {
-  return formatDate(date, 'EEEEEE');
-};
-var dayLabelFormat = function dayLabelFormat(date) {
-  return formatDate(date, 'd');
-};
-var monthLabelFormat = function monthLabelFormat(date) {
-  return formatDate(date, 'LLLL');
-};
 var generateMonthsData = function generateMonthsData(pastMonthsCount, futureMonthsCount, direction) {
   var months = [];
   var currentDate = new Date();
@@ -303,18 +294,6 @@ var Calendar = function Calendar(_ref) {
     return monthsArray.map(function (_ref2) {
       var month = _ref2.month,
         year = _ref2.year;
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      var _useMonth = useMonth({
-          year: year,
-          month: month,
-          firstDayOfWeek: firstDayOfWeek,
-          dayLabelFormat: dayLabelFormat,
-          weekdayLabelFormat: weekdayLabelFormat,
-          monthLabelFormat: monthLabelFormat
-        }),
-        days = _useMonth.days,
-        weekdayLabels = _useMonth.weekdayLabels,
-        monthLabel = _useMonth.monthLabel;
       var isPrevMonthDisabled = !!minBookingDate && isSameMonth(new Date(year, month, 1), minBookingDate);
       var isNextMonthDisabled = !!maxBookingDate && isSameMonth(new Date(year, month, 1), maxBookingDate);
       var isCurrentMonth = new Date().getFullYear() === year && new Date().getMonth() === month;
@@ -328,14 +307,15 @@ var Calendar = function Calendar(_ref) {
           arrowRight: dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.arrowRight
         },
         year: year,
-        weekdayLabels: weekdayLabels,
-        monthLabel: monthLabel,
+        month: month,
+        firstDayOfWeek: firstDayOfWeek,
         isPrevMonthDisabled: isModernType || isPrevMonthDisabled,
         isNextMonthDisabled: isModernType || isNextMonthDisabled,
         goToPreviousMonth: goToPreviousMonths,
         goToNextMonth: goToNextMonths,
-        isModern: isModernType
-      }, renderDays(days)));
+        isModern: isModernType,
+        renderDays: renderDays
+      }));
     });
   };
   return /*#__PURE__*/React.createElement("div", _extends({}, filterDataAttrs(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.root), {

package/dist/es/components/Calendar/components/_Month/Month.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FirstDayOfWeek, MonthType } from '@datepicker-react/hooks';
+import { FirstDayOfWeek, MonthType, UseMonthResult } from '@datepicker-react/hooks';
 import './Month.scss';
 export interface IMonthPickerProps {
     firstDayOfWeek: FirstDayOfWeek;
@@ -16,12 +16,12 @@ export interface IMonthProps {
     isPrevMonthDisabled: boolean;
     isNextMonthDisabled: boolean;
     year: number;
-    monthLabel: string;
-    weekdayLabels: string[];
+    month: number;
+    firstDayOfWeek?: FirstDayOfWeek;
     goToPreviousMonth: () => void;
     goToNextMonth: () => void;
     isModern?: boolean;
-    children?: React.ReactNode;
+    renderDays: (days: UseMonthResult['days']) => React.ReactNode;
 }
 declare const Month: React.FC<IMonthProps>;
 export default Month;

package/dist/es/components/Calendar/components/_Month/Month.js

@@ -2,7 +2,10 @@ import _extends from "@babel/runtime/helpers/extends";
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.map.js";
 import * as React from 'react';
+import { useMonth } from '@datepicker-react/hooks';
 import { checkEventIsClickOrEnterPress, cnCreate, filterDataAttrs } from '@megafon/ui-helpers';
+import format from 'date-fns/format';
+import ruLocale from 'date-fns/locale/ru';
 import "./Month.css";
 var ArrowLeft = function ArrowLeft(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
@@ -22,19 +25,45 @@ var ArrowRight = function ArrowRight(props) {
     clipRule: "evenodd"
   }));
 };
+var formatDate = function formatDate(date, pattern) {
+  var locale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ruLocale;
+  return format(date, pattern, {
+    locale: locale
+  });
+};
+var weekdayLabelFormat = function weekdayLabelFormat(date) {
+  return formatDate(date, 'EEEEEE');
+};
+var dayLabelFormat = function dayLabelFormat(date) {
+  return formatDate(date, 'd');
+};
+var monthLabelFormat = function monthLabelFormat(date) {
+  return formatDate(date, 'LLLL');
+};
 var cn = cnCreate('mfui-month');
 var Month = function Month(_ref) {
   var dataAttrs = _ref.dataAttrs,
     isPrevMonthDisabled = _ref.isPrevMonthDisabled,
     isNextMonthDisabled = _ref.isNextMonthDisabled,
     year = _ref.year,
-    monthLabel = _ref.monthLabel,
-    weekdayLabels = _ref.weekdayLabels,
+    month = _ref.month,
+    firstDayOfWeek = _ref.firstDayOfWeek,
     goToPreviousMonth = _ref.goToPreviousMonth,
     goToNextMonth = _ref.goToNextMonth,
     _ref$isModern = _ref.isModern,
     isModern = _ref$isModern === void 0 ? false : _ref$isModern,
-    children = _ref.children;
+    renderDays = _ref.renderDays;
+  var _useMonth = useMonth({
+      year: year,
+      month: month,
+      firstDayOfWeek: firstDayOfWeek,
+      dayLabelFormat: dayLabelFormat,
+      weekdayLabelFormat: weekdayLabelFormat,
+      monthLabelFormat: monthLabelFormat
+    }),
+    days = _useMonth.days,
+    weekdayLabels = _useMonth.weekdayLabels,
+    monthLabel = _useMonth.monthLabel;
   var handleArrowLeftClick = function handleArrowLeftClick(e) {
     if (checkEventIsClickOrEnterPress(e)) {
       !isPrevMonthDisabled && goToPreviousMonth();
@@ -83,6 +112,6 @@ var Month = function Month(_ref) {
     }, dayLabel);
   })), /*#__PURE__*/React.createElement("div", {
     className: cn('days')
-  }, children));
+  }, renderDays(days)));
 };
 export default Month;

package/dist/lib/components/Calendar/Calendar.js

@@ -56,15 +56,6 @@ var CalendarDirectionTypes = exports.CalendarDirectionTypes = {
   FUTURE: 'future',
   BOTH: 'both'
 };
-var weekdayLabelFormat = function weekdayLabelFormat(date) {
-  return formatDate(date, 'EEEEEE');
-};
-var dayLabelFormat = function dayLabelFormat(date) {
-  return formatDate(date, 'd');
-};
-var monthLabelFormat = function monthLabelFormat(date) {
-  return formatDate(date, 'LLLL');
-};
 var generateMonthsData = function generateMonthsData(pastMonthsCount, futureMonthsCount, direction) {
   var months = [];
   var currentDate = new Date();
@@ -312,18 +303,6 @@ var Calendar = function Calendar(_ref) {
     return monthsArray.map(function (_ref2) {
       var month = _ref2.month,
         year = _ref2.year;
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      var _useMonth = (0, _hooks.useMonth)({
-          year: year,
-          month: month,
-          firstDayOfWeek: firstDayOfWeek,
-          dayLabelFormat: dayLabelFormat,
-          weekdayLabelFormat: weekdayLabelFormat,
-          monthLabelFormat: monthLabelFormat
-        }),
-        days = _useMonth.days,
-        weekdayLabels = _useMonth.weekdayLabels,
-        monthLabel = _useMonth.monthLabel;
       var isPrevMonthDisabled = !!minBookingDate && (0, _isSameMonth["default"])(new Date(year, month, 1), minBookingDate);
       var isNextMonthDisabled = !!maxBookingDate && (0, _isSameMonth["default"])(new Date(year, month, 1), maxBookingDate);
       var isCurrentMonth = new Date().getFullYear() === year && new Date().getMonth() === month;
@@ -337,14 +316,15 @@ var Calendar = function Calendar(_ref) {
           arrowRight: dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.arrowRight
         },
         year: year,
-        weekdayLabels: weekdayLabels,
-        monthLabel: monthLabel,
+        month: month,
+        firstDayOfWeek: firstDayOfWeek,
         isPrevMonthDisabled: isModernType || isPrevMonthDisabled,
         isNextMonthDisabled: isModernType || isNextMonthDisabled,
         goToPreviousMonth: goToPreviousMonths,
         goToNextMonth: goToNextMonths,
-        isModern: isModernType
-      }, renderDays(days)));
+        isModern: isModernType,
+        renderDays: renderDays
+      }));
     });
   };
   return /*#__PURE__*/React.createElement("div", (0, _extends2["default"])({}, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.root), {

package/dist/lib/components/Calendar/components/_Month/Month.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FirstDayOfWeek, MonthType } from '@datepicker-react/hooks';
+import { FirstDayOfWeek, MonthType, UseMonthResult } from '@datepicker-react/hooks';
 import './Month.scss';
 export interface IMonthPickerProps {
     firstDayOfWeek: FirstDayOfWeek;
@@ -16,12 +16,12 @@ export interface IMonthProps {
     isPrevMonthDisabled: boolean;
     isNextMonthDisabled: boolean;
     year: number;
-    monthLabel: string;
-    weekdayLabels: string[];
+    month: number;
+    firstDayOfWeek?: FirstDayOfWeek;
     goToPreviousMonth: () => void;
     goToNextMonth: () => void;
     isModern?: boolean;
-    children?: React.ReactNode;
+    renderDays: (days: UseMonthResult['days']) => React.ReactNode;
 }
 declare const Month: React.FC<IMonthProps>;
 export default Month;

package/dist/lib/components/Calendar/components/_Month/Month.js

@@ -9,7 +9,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
 var React = _interopRequireWildcard(require("react"));
+var _hooks = require("@datepicker-react/hooks");
 var _uiHelpers = require("@megafon/ui-helpers");
+var _format = _interopRequireDefault(require("date-fns/format"));
+var _ru = _interopRequireDefault(require("date-fns/locale/ru"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -31,19 +34,45 @@ var ArrowRight = function ArrowRight(props) {
     clipRule: "evenodd"
   }));
 };
+var formatDate = function formatDate(date, pattern) {
+  var locale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _ru["default"];
+  return (0, _format["default"])(date, pattern, {
+    locale: locale
+  });
+};
+var weekdayLabelFormat = function weekdayLabelFormat(date) {
+  return formatDate(date, 'EEEEEE');
+};
+var dayLabelFormat = function dayLabelFormat(date) {
+  return formatDate(date, 'd');
+};
+var monthLabelFormat = function monthLabelFormat(date) {
+  return formatDate(date, 'LLLL');
+};
 var cn = (0, _uiHelpers.cnCreate)('mfui-month');
 var Month = function Month(_ref) {
   var dataAttrs = _ref.dataAttrs,
     isPrevMonthDisabled = _ref.isPrevMonthDisabled,
     isNextMonthDisabled = _ref.isNextMonthDisabled,
     year = _ref.year,
-    monthLabel = _ref.monthLabel,
-    weekdayLabels = _ref.weekdayLabels,
+    month = _ref.month,
+    firstDayOfWeek = _ref.firstDayOfWeek,
     goToPreviousMonth = _ref.goToPreviousMonth,
     goToNextMonth = _ref.goToNextMonth,
     _ref$isModern = _ref.isModern,
     isModern = _ref$isModern === void 0 ? false : _ref$isModern,
-    children = _ref.children;
+    renderDays = _ref.renderDays;
+  var _useMonth = (0, _hooks.useMonth)({
+      year: year,
+      month: month,
+      firstDayOfWeek: firstDayOfWeek,
+      dayLabelFormat: dayLabelFormat,
+      weekdayLabelFormat: weekdayLabelFormat,
+      monthLabelFormat: monthLabelFormat
+    }),
+    days = _useMonth.days,
+    weekdayLabels = _useMonth.weekdayLabels,
+    monthLabel = _useMonth.monthLabel;
   var handleArrowLeftClick = function handleArrowLeftClick(e) {
     if ((0, _uiHelpers.checkEventIsClickOrEnterPress)(e)) {
       !isPrevMonthDisabled && goToPreviousMonth();
@@ -92,6 +121,6 @@ var Month = function Month(_ref) {
     }, dayLabel);
   })), /*#__PURE__*/React.createElement("div", {
     className: cn('days')
-  }, children));
+  }, renderDays(days)));
 };
 var _default = exports["default"] = Month;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@megafon/ui-core",
-    "version": "7.4.1",
+    "version": "7.5.0",
     "files": [
         "dist",
         "styles"
@@ -50,7 +50,7 @@
         "@babel/preset-env": "^7.8.6",
         "@babel/preset-react": "^7.8.3",
         "@babel/preset-typescript": "^7.8.3",
-        "@megafon/ui-icons": "^3.3.0",
+        "@megafon/ui-icons": "^3.4.0",
         "@svgr/core": "^2.4.1",
         "@testing-library/jest-dom": "^6.5.0",
         "@testing-library/react": "^16.0.1",
@@ -104,5 +104,5 @@
         "simplebar-react": "^3.2.5",
         "swiper": "^11.1.1"
     },
-    "gitHead": "0e2e21bc1f63599d5c0c1c606178422e1d70e787"
+    "gitHead": "2254ae9321758f64bbf0756457946865b494cedb"
 }