react-calendar - npm Package Compare versions

Comparing version 3.5.0 to 3.6.0

dist/esm/Calendar.js

@@ -626,3 +626,3 @@ var _excluded = ["activeStartDate", "defaultActiveStartDate", "defaultValue", "defaultView", "maxDetail", "minDetail", "value", "view"];
               onMouseLeave: selectRange ? onMouseLeave : null,
-              showFixedNumberOfWeeks: showFixedNumberOfWeeks || showDoubleView,
+              showFixedNumberOfWeeks: typeof showFixedNumberOfWeeks !== 'undefined' ? showFixedNumberOfWeeks : showDoubleView,
               showNeighboringMonth: showNeighboringMonth,
@@ -629,0 +629,0 @@ showWeekNumbers: showWeekNumbers

dist/esm/Flex.js

@@ -43,3 +43,4 @@ var _excluded = ["children", "className", "direction", "count", "offset", "style", "wrap"];
         flexBasis: toPercent(100 / count),
-        maxWidth: toPercent(100 / count),
+        flexShrink: 0,
+        flexGrow: 0,
         overflow: 'hidden',
@@ -46,0 +47,0 @@ marginLeft: offset && index === 0 ? toPercent(100 * offset / count) : null

dist/esm/MonthView/WeekNumber.js

@@ -0,15 +1,28 @@
+var _excluded = ["date", "onClickWeekNumber", "weekNumber"];
+
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 import React from 'react';
 import PropTypes from 'prop-types';
+var className = 'react-calendar__tile';
 export default function WeekNumber(_ref) {
   var date = _ref.date,
       onClickWeekNumber = _ref.onClickWeekNumber,
-      weekNumber = _ref.weekNumber;
-  var props = {
-    className: 'react-calendar__tile',
-    style: {
-      flexGrow: 1
-    }
-  };
+      weekNumber = _ref.weekNumber,
+      otherProps = _objectWithoutProperties(_ref, _excluded);
+
+  var props = _objectSpread({
+    className: className
+  }, otherProps);
+
   var children = /*#__PURE__*/React.createElement("span", null, weekNumber);
@@ -16,0 +29,0 @@ return onClickWeekNumber ? /*#__PURE__*/React.createElement("button", _extends({}, props, {

dist/esm/shared/dates.js

@@ -75,3 +75,3 @@ import { getYear, getMonth as getMonthIndex, getCenturyStart, getPreviousCenturyStart, getNextCenturyStart, getCenturyEnd, getPreviousCenturyEnd, getCenturyRange, getDecadeStart, getPreviousDecadeStart, getNextDecadeStart, getDecadeEnd, getPreviousDecadeEnd, getDecadeRange, getYearStart, getPreviousYearStart, getNextYearStart, getYearEnd, getPreviousYearEnd, getYearRange, getMonthStart, getPreviousMonthStart, getNextMonthStart, getMonthEnd, getPreviousMonthEnd, getMonthRange, getDayStart, getDayEnd, getDayRange } from '@wojtekmaj/date-utils';
   var calendarTypeForWeekNumber = calendarType === CALENDAR_TYPES.US ? CALENDAR_TYPES.US : CALENDAR_TYPES.ISO_8601;
-  var beginOfWeek = getBeginOfWeek(date, calendarTypeForWeekNumber);
+  var beginOfWeek = getBeginOfWeek(date, calendarType);
   var year = getYear(date) + 1;
@@ -83,5 +83,5 @@ var dayInWeekOne;
     dayInWeekOne = new Date(year, 0, calendarTypeForWeekNumber === CALENDAR_TYPES.ISO_8601 ? 4 : 1);
-    beginOfFirstWeek = getBeginOfWeek(dayInWeekOne, calendarTypeForWeekNumber);
+    beginOfFirstWeek = getBeginOfWeek(dayInWeekOne, calendarType);
     year -= 1;
-  } while (date - beginOfFirstWeek < 0);
+  } while (date < beginOfFirstWeek);
 
@@ -88,0 +88,0 @@ return Math.round((beginOfWeek - beginOfFirstWeek) / (8.64e7 * 7)) + 1;

dist/umd/Calendar.js

@@ -650,3 +650,3 @@ "use strict";
               onMouseLeave: selectRange ? onMouseLeave : null,
-              showFixedNumberOfWeeks: showFixedNumberOfWeeks || showDoubleView,
+              showFixedNumberOfWeeks: typeof showFixedNumberOfWeeks !== 'undefined' ? showFixedNumberOfWeeks : showDoubleView,
               showNeighboringMonth: showNeighboringMonth,
@@ -653,0 +653,0 @@ showWeekNumbers: showWeekNumbers

dist/umd/Flex.js

@@ -53,3 +53,4 @@ "use strict";
         flexBasis: toPercent(100 / count),
-        maxWidth: toPercent(100 / count),
+        flexShrink: 0,
+        flexGrow: 0,
         overflow: 'hidden',
@@ -56,0 +57,0 @@ marginLeft: offset && index === 0 ? toPercent(100 * offset / count) : null

dist/umd/MonthView/WeekNumber.js

@@ -12,2 +12,4 @@ "use strict";
 
+var _excluded = ["date", "onClickWeekNumber", "weekNumber"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -17,13 +19,24 @@
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var className = 'react-calendar__tile';
+
 function WeekNumber(_ref) {
   var date = _ref.date,
       onClickWeekNumber = _ref.onClickWeekNumber,
-      weekNumber = _ref.weekNumber;
-  var props = {
-    className: 'react-calendar__tile',
-    style: {
-      flexGrow: 1
-    }
-  };
+      weekNumber = _ref.weekNumber,
+      otherProps = _objectWithoutProperties(_ref, _excluded);
 
+  var props = _objectSpread({
+    className: className
+  }, otherProps);
+
   var children = /*#__PURE__*/_react["default"].createElement("span", null, weekNumber);
@@ -30,0 +43,0 @@

dist/umd/shared/dates.js

@@ -104,3 +104,3 @@ "use strict";
   var calendarTypeForWeekNumber = calendarType === _const.CALENDAR_TYPES.US ? _const.CALENDAR_TYPES.US : _const.CALENDAR_TYPES.ISO_8601;
-  var beginOfWeek = getBeginOfWeek(date, calendarTypeForWeekNumber);
+  var beginOfWeek = getBeginOfWeek(date, calendarType);
   var year = (0, _dateUtils.getYear)(date) + 1;
@@ -112,5 +112,5 @@ var dayInWeekOne;
     dayInWeekOne = new Date(year, 0, calendarTypeForWeekNumber === _const.CALENDAR_TYPES.ISO_8601 ? 4 : 1);
-    beginOfFirstWeek = getBeginOfWeek(dayInWeekOne, calendarTypeForWeekNumber);
+    beginOfFirstWeek = getBeginOfWeek(dayInWeekOne, calendarType);
     year -= 1;
-  } while (date - beginOfFirstWeek < 0);
+  } while (date < beginOfFirstWeek);
 
@@ -117,0 +117,0 @@ return Math.round((beginOfWeek - beginOfFirstWeek) / (8.64e7 * 7)) + 1;

package.json

 {
   "name": "react-calendar",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Ultimate calendar for your React app.",
@@ -21,3 +21,2 @@ "main": "dist/umd/index.js",
     "jest": "jest",
-    "jest-coverage": "jest --coverage",
     "lint": "eslint sample/ src/ test/ --ext .jsx,.js",
@@ -109,3 +108,4 @@ "prepack": "yarn clean && yarn build",
   },
-  "funding": "https://github.com/wojtekmaj/react-calendar?sponsor=1"
+  "funding": "https://github.com/wojtekmaj/react-calendar?sponsor=1",
+  "packageManager": "yarn@3.1.0"
 }

README.md

@@ -1,2 +0,2 @@
-[![npm](https://img.shields.io/npm/v/react-calendar.svg)](https://www.npmjs.com/package/react-calendar) ![downloads](https://img.shields.io/npm/dt/react-calendar.svg) [![CI](https://github.com/wojtekmaj/react-calendar/workflows/CI/badge.svg)](https://github.com/wojtekmaj/react-calendar/actions) ![dependencies](https://img.shields.io/david/wojtekmaj/react-calendar.svg) ![dev dependencies](https://img.shields.io/david/dev/wojtekmaj/react-calendar.svg) [![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
+[![npm](https://img.shields.io/npm/v/react-calendar.svg)](https://www.npmjs.com/package/react-calendar) ![downloads](https://img.shields.io/npm/dt/react-calendar.svg) [![CI](https://github.com/wojtekmaj/react-calendar/workflows/CI/badge.svg)](https://github.com/wojtekmaj/react-calendar/actions) [![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
 
@@ -71,3 +71,3 @@ # React-Calendar
 
-Check the [sample directory](https://github.com/wojtekmaj/react-calendar/tree/master/sample) in this repository for a full working example. For more examples and more advanced use cases, check [Recipes](https://github.com/wojtekmaj/react-calendar/wiki/Recipes) in [React-Calendar Wiki](https://github.com/wojtekmaj/react-calendar/wiki).
+Check the [sample directory](https://github.com/wojtekmaj/react-calendar/tree/main/sample) in this repository for a full working example. For more examples and more advanced use cases, check [Recipes](https://github.com/wojtekmaj/react-calendar/wiki/Recipes) in [React-Calendar Wiki](https://github.com/wojtekmaj/react-calendar/wiki).
 
@@ -133,3 +133,3 @@ ### Custom styling
 |returnValue|Which dates shall be passed by the calendar to the onChange function and onClick{Period} functions. Can be `"start"`, `"end"` or `"range"`. The latter will cause an array with start and end values to be passed.|`"start"`|`"range"`|
-|showDoubleView|Whether to show two months/years/… at a time instead of one. Forces `showFixedNumberOfWeeks` prop to be `true`.|`false`|`true`|
+|showDoubleView|Whether to show two months/years/… at a time instead of one. Defaults `showFixedNumberOfWeeks` prop to be `true`.|`false`|`true`|
 |showFixedNumberOfWeeks|Whether to always show fixed number of weeks (6). Forces `showNeighboringMonth` prop to be `true`.|`false`|`true`|
@@ -136,0 +136,0 @@ |showNavigation|Whether a navigation bar with arrows and title shall be rendered.|`true`|`false`|

src/Calendar.jsx

@@ -552,3 +552,3 @@ import React, { Component } from 'react';
             onMouseLeave={selectRange ? onMouseLeave : null}
-            showFixedNumberOfWeeks={showFixedNumberOfWeeks || showDoubleView}
+            showFixedNumberOfWeeks={typeof showFixedNumberOfWeeks !== 'undefined' ? showFixedNumberOfWeeks : showDoubleView}
             showNeighboringMonth={showNeighboringMonth}
@@ -555,0 +555,0 @@ showWeekNumbers={showWeekNumbers}

src/Flex.jsx

@@ -36,3 +36,4 @@ import React from 'react';
               flexBasis: toPercent(100 / count),
-              maxWidth: toPercent(100 / count),
+              flexShrink: 0,
+              flexGrow: 0,
               overflow: 'hidden',
@@ -39,0 +40,0 @@ marginLeft: offset && (index === 0) ? toPercent((100 * offset) / count) : null,

src/MonthView/WeekNumber.jsx

 import React from 'react';
 import PropTypes from 'prop-types';
 
+const className = 'react-calendar__tile';
+
 export default function WeekNumber({
@@ -8,6 +10,7 @@ date,
   weekNumber,
+  ...otherProps
 }) {
   const props = {
-    className: 'react-calendar__tile',
-    style: { flexGrow: 1 },
+    className,
+    ...otherProps,
   };
@@ -14,0 +17,0 @@

src/shared/dates.js

@@ -112,3 +112,3 @@ import {
   );
-  const beginOfWeek = getBeginOfWeek(date, calendarTypeForWeekNumber);
+  const beginOfWeek = getBeginOfWeek(date, calendarType);
   let year = getYear(date) + 1;
@@ -121,5 +121,5 @@ let dayInWeekOne;
     dayInWeekOne = new Date(year, 0, calendarTypeForWeekNumber === CALENDAR_TYPES.ISO_8601 ? 4 : 1);
-    beginOfFirstWeek = getBeginOfWeek(dayInWeekOne, calendarTypeForWeekNumber);
+    beginOfFirstWeek = getBeginOfWeek(dayInWeekOne, calendarType);
     year -= 1;
-  } while (date - beginOfFirstWeek < 0);
+  } while (date < beginOfFirstWeek);
 
@@ -126,0 +126,0 @@ return Math.round((beginOfWeek - beginOfFirstWeek) / (8.64e7 * 7)) + 1;

src/shared/dates.spec.js

@@ -224,5 +224,5 @@ import { getDayStart, getDayEnd } from '@wojtekmaj/date-utils';
   it('returns proper week number for a sample year starting in week 1 (US)', () => {
-    const year = 2015;
-    const month = 11;
-    const startDate = 27;
+    const year = 2016;
+    const month = 0;
+    const startDate = 1;
 
@@ -239,16 +239,2 @@ for (let currentWeek = 1; currentWeek <= 53; currentWeek += 1) {
 
-  it('returns proper week number for a sample week 1 (US)', () => {
-    const year = 2015;
-    const month = 11;
-    const startDate = 27;
-
-    for (let currentDate = startDate; currentDate < startDate + 7; currentDate += 1) {
-      const date = new Date(year, month, currentDate);
-
-      const weekNumber = getWeekNumber(date, 'US');
-
-      expect(weekNumber).toBe(1);
-    }
-  });
-
   it('returns proper week number for a sample week 52 (US)', () => {
@@ -283,3 +269,3 @@ const year = 2017;
   it('returns proper week number for a sample week 1 (Arabic)', () => {
-    const year = 2018;
+    const year = 2022;
     const month = 0;
@@ -313,3 +299,3 @@ const startDate = 1;
   it('returns proper week number for a sample week 52 (Arabic)', () => {
-    const year = 2016;
+    const year = 2020;
     const month = 11;
@@ -328,3 +314,3 @@ const startDate = 26;
   it('returns proper week number for a sample week 53 (Arabic)', () => {
-    const year = 2015;
+    const year = 2019;
     const month = 11;
@@ -343,3 +329,3 @@ const startDate = 28;
   it('returns proper week number for a sample week 1 (Hebrew)', () => {
-    const year = 2018;
+    const year = 2017;
     const month = 0;
@@ -375,3 +361,3 @@ const startDate = 1;
     const month = 11;
-    const startDate = 26;
+    const startDate = 25;
 
@@ -388,3 +374,3 @@ for (let currentDate = startDate; currentDate < startDate + 7; currentDate += 1) {
   it('returns proper week number for a sample week 53 (Hebrew)', () => {
-    const year = 2015;
+    const year = 2014;
     const month = 11;
@@ -391,0 +377,0 @@ const startDate = 28;

No alert changes

Improved metrics

Total package byte prevSize

477120

0.75%

Lines of code

10901

0.12%

No dependency changes