react-calendar - npm Package Compare versions

Comparing version 2.17.0-beta to 2.17.0

dist/Calendar.js

@@ -99,3 +99,3 @@ 'use strict';
 
-var getValueFrom = function getValueFrom(value, minDate, maxDate, maxDetail) {
+var getValueFrom = function getValueFrom(value) {
   if (!value) {
@@ -117,8 +117,18 @@ return null;
 
-  var valueFrom = (0, _dates.getBegin)(getValueType(maxDetail), valueFromDate);
+  return valueFromDate;
+};
 
-  return (0, _utils.between)(valueFrom, minDate, maxDate);
+var getDetailValueFrom = function getDetailValueFrom(value, minDate, maxDate, maxDetail) {
+  var valueFrom = getValueFrom(value);
+
+  if (!valueFrom) {
+    return null;
+  }
+
+  var detailValueFrom = (0, _dates.getBegin)(getValueType(maxDetail), valueFrom);
+
+  return (0, _utils.between)(detailValueFrom, minDate, maxDate);
 };
 
-var getValueTo = function getValueTo(value, minDate, maxDate, maxDetail) {
+var getValueTo = function getValueTo(value) {
   if (!value) {
@@ -140,8 +150,18 @@ return null;
 
-  var valueTo = (0, _dates.getEnd)(getValueType(maxDetail), valueToDate);
+  return valueToDate;
+};
 
-  return (0, _utils.between)(valueTo, minDate, maxDate);
+var getDetailValueTo = function getDetailValueTo(value, minDate, maxDate, maxDetail) {
+  var valueTo = getValueTo(value);
+
+  if (!valueTo) {
+    return null;
+  }
+
+  var detailValueTo = (0, _dates.getEnd)(getValueType(maxDetail), valueTo);
+
+  return (0, _utils.between)(detailValueTo, minDate, maxDate);
 };
 
-var getValueArray = function getValueArray(value, minDate, maxDate, maxDetail) {
+var getDetailValueArray = function getDetailValueArray(value, minDate, maxDate, maxDetail) {
   if (value instanceof Array) {
@@ -151,3 +171,3 @@ return value;
 
-  return [getValueFrom(value, minDate, maxDate, maxDetail), getValueTo(value, minDate, maxDate, maxDetail)];
+  return [getDetailValueFrom(value, minDate, maxDate, maxDetail), getDetailValueTo(value, minDate, maxDate, maxDetail)];
 };
@@ -166,3 +186,3 @@
   var rangeType = getView(view, minDetail, maxDetail);
-  var valueFrom = getValueFrom(value, minDate, maxDate, maxDetail) || activeStartDate || new Date();
+  var valueFrom = getDetailValueFrom(value, minDate, maxDate, maxDetail) || activeStartDate || new Date();
   return (0, _dates.getBegin)(rangeType, valueFrom);
@@ -314,7 +334,7 @@ };
         case 'start':
-          return getValueFrom(value, minDate, maxDate, maxDetail);
+          return getDetailValueFrom(value, minDate, maxDate, maxDetail);
         case 'end':
-          return getValueTo(value, minDate, maxDate, maxDetail);
+          return getDetailValueTo(value, minDate, maxDate, maxDetail);
         case 'range':
-          return getValueArray(value, minDate, maxDate, maxDetail);
+          return getDetailValueArray(value, minDate, maxDate, maxDetail);
         default:
@@ -552,3 +572,3 @@ throw new Error('Invalid returnValue.');
       /**
-       * If the next value is different from the current one  (with an exception of situation in
+       * If the next value is different from the current one (with an exception of situation in
        * which values provided are limited by minDate and maxDate so that the dates are the same),
@@ -555,0 +575,0 @@ * get a new one.

dist/shared/dateFormatter.js

@@ -8,4 +8,8 @@ 'use strict';
 
-var _locales = require('./locales');
+var _getUserLocale = require('get-user-locale');
 
+var _getUserLocale2 = _interopRequireDefault(_getUserLocale);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var formatterCache = {};
@@ -21,3 +25,3 @@
     // eslint-disable-next-line no-param-reassign
-    locale = (0, _locales.getDefaultLocale)();
+    locale = (0, _getUserLocale2.default)();
   }
@@ -24,0 +28,0 @@

package.json

 {
   "name": "react-calendar",
-  "version": "2.17.0-beta",
+  "version": "2.17.0",
   "description": "Ultimate calendar for your React app.",
@@ -16,3 +16,3 @@ "main": "dist/entry.js",
     "test": "yarn run test-eslint && yarn run test-jest",
-    "test-eslint": "eslint --ext .jsx,.js src/",
+    "test-eslint": "eslint src/ test/ --ext .jsx,.js",
     "test-jest": "jest",
@@ -66,3 +66,3 @@ "test-jest-coverage": "jest --coverage"
   "dependencies": {
-    "lodash.once": "^4.1.1",
+    "get-user-locale": "^1.1.0",
     "merge-class-names": "^1.1.1",
@@ -86,9 +86,9 @@ "prop-types": "^15.6.0",
     "eslint": "^4.19.1",
-    "eslint-config-airbnb": "^17.0.0",
-    "eslint-plugin-import": "^2.13.0",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jsx-a11y": "^6.1.1",
-    "eslint-plugin-react": "^7.9.1",
-    "jest": "^23.4.1",
-    "jest-cli": "^23.4.1",
-    "less": "^3.7.1",
+    "eslint-plugin-react": "^7.11.1",
+    "jest": "^23.5.0",
+    "jest-cli": "^23.5.0",
+    "less": "~3.7.1",
     "react": "^16.4.1",
@@ -95,0 +95,0 @@ "react-dom": "^16.4.1",

src/__tests__/Calendar.jsx

@@ -280,2 +280,22 @@ import React from 'react';
 
+  it('updates the value if the day previously partially covered is now fully covered', () => {
+    const value = [new Date(2018, 0, 1, 12), new Date(2018, 1, 1)];
+
+    const component = mount(
+      <Calendar
+        value={value}
+      />
+    );
+
+    expect(component.state().value).toBe(value);
+
+    const nextValue = [new Date(2018, 0, 1), new Date(2018, 1, 1)];
+
+    component.setProps({
+      value: nextValue,
+    });
+
+    expect(component.state().value).toBe(nextValue);
+  });
+
   it('calls onChange function returning beginning of selected period by default', () => {
@@ -282,0 +302,0 @@ const onChange = jest.fn();

src/__tests__/MonthView.jsx

@@ -5,5 +5,3 @@ import React from 'react';
 import MonthView from '../MonthView';
-import {
-  getISOLocalDate,
-} from '../shared/dates';
+import { getISOLocalDate } from '../shared/dates';
 
@@ -10,0 +8,0 @@ /* eslint-disable comma-dangle */

src/Calendar.jsx

@@ -55,3 +55,3 @@ import React, { Component } from 'react';
 
-const getValueFrom = (value, minDate, maxDate, maxDetail) => {
+const getValueFrom = (value) => {
   if (!value) {
@@ -73,8 +73,18 @@ return null;
 
-  const valueFrom = getBegin(getValueType(maxDetail), valueFromDate);
+  return valueFromDate;
+};
 
-  return between(valueFrom, minDate, maxDate);
+const getDetailValueFrom = (value, minDate, maxDate, maxDetail) => {
+  const valueFrom = getValueFrom(value);
+
+  if (!valueFrom) {
+    return null;
+  }
+
+  const detailValueFrom = getBegin(getValueType(maxDetail), valueFrom);
+
+  return between(detailValueFrom, minDate, maxDate);
 };
 
-const getValueTo = (value, minDate, maxDate, maxDetail) => {
+const getValueTo = (value) => {
   if (!value) {
@@ -96,8 +106,18 @@ return null;
 
-  const valueTo = getEnd(getValueType(maxDetail), valueToDate);
+  return valueToDate;
+};
 
-  return between(valueTo, minDate, maxDate);
+const getDetailValueTo = (value, minDate, maxDate, maxDetail) => {
+  const valueTo = getValueTo(value);
+
+  if (!valueTo) {
+    return null;
+  }
+
+  const detailValueTo = getEnd(getValueType(maxDetail), valueTo);
+
+  return between(detailValueTo, minDate, maxDate);
 };
 
-const getValueArray = (value, minDate, maxDate, maxDetail) => {
+const getDetailValueArray = (value, minDate, maxDate, maxDetail) => {
   if (value instanceof Array) {
@@ -108,4 +128,4 @@ return value;
   return [
-    getValueFrom(value, minDate, maxDate, maxDetail),
-    getValueTo(value, minDate, maxDate, maxDetail),
+    getDetailValueFrom(value, minDate, maxDate, maxDetail),
+    getDetailValueTo(value, minDate, maxDate, maxDetail),
   ];
@@ -127,3 +147,3 @@ };
   const valueFrom = (
-    getValueFrom(value, minDate, maxDate, maxDetail)
+    getDetailValueFrom(value, minDate, maxDate, maxDetail)
     || activeStartDate
@@ -170,7 +190,7 @@ || new Date()
       case 'start':
-        return getValueFrom(value, minDate, maxDate, maxDetail);
+        return getDetailValueFrom(value, minDate, maxDate, maxDetail);
       case 'end':
-        return getValueTo(value, minDate, maxDate, maxDetail);
+        return getDetailValueTo(value, minDate, maxDate, maxDetail);
       case 'range':
-        return getValueArray(value, minDate, maxDate, maxDetail);
+        return getDetailValueArray(value, minDate, maxDate, maxDetail);
       default:
@@ -209,3 +229,3 @@ throw new Error('Invalid returnValue.');
     /**
-     * If the next value is different from the current one  (with an exception of situation in
+     * If the next value is different from the current one (with an exception of situation in
      * which values provided are limited by minDate and maxDate so that the dates are the same),
@@ -217,4 +237,8 @@ * get a new one.
       nextState.view // Allowed view changed
-      || datesAreDifferent(...values.map(value => getValueFrom(value, minDate, maxDate, maxDetail)))
-      || datesAreDifferent(...values.map(value => getValueTo(value, minDate, maxDate, maxDetail)))
+      || datesAreDifferent(
+        ...values.map(value => getValueFrom(value, minDate, maxDate, maxDetail)),
+      )
+      || datesAreDifferent(
+        ...values.map(value => getValueTo(value, minDate, maxDate, maxDetail)),
+      )
     ) {
@@ -221,0 +245,0 @@ nextState.value = nextProps.value;

src/shared/dateFormatter.js

@@ -1,2 +0,2 @@
-import { getDefaultLocale } from './locales';
+import getUserLocale from 'get-user-locale';
 
@@ -13,3 +13,3 @@ const formatterCache = {};
     // eslint-disable-next-line no-param-reassign
-    locale = getDefaultLocale();
+    locale = getUserLocale();
   }
@@ -16,0 +16,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

341061

increased by0.15%

Lines of code

8589

increased by0.19%

Number of low quality alerts

1

decreased by-50%

Worsened metrics

Number of package files

76

decreased by-2.56%

Dependency changes

• + Addedget-user-locale@^1.1.0

• + Addedget-user-locale@1.5.1(transitive)

• + Addedlodash.memoize@4.1.2(transitive)

• - Removedlodash.once@^4.1.1

• - Removedlodash.once@4.1.1(transitive)