Use @wojtekmaj/date-utils package (#204)

wojtekmaj · Nov 10, 2019 · b12d488 · b12d488
1 parent 4a38abd
commit b12d488
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -72,6 +72,7 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@wojtekmaj/date-utils": "^1.0.0",
     "get-user-locale": "^1.2.0",
     "make-event-props": "^1.1.0",
     "merge-class-names": "^1.1.1",

diff --git a/src/DateInput.jsx b/src/DateInput.jsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { polyfill } from 'react-lifecycles-compat';
+import { getYear, getMonthHuman, getDate } from '@wojtekmaj/date-utils';
 
 import Divider from './Divider';
 import DayInput from './DateInput/DayInput';
@@ -12,10 +13,7 @@ import NativeInput from './DateInput/NativeInput';
 import { getFormatter } from './shared/dateFormatter';
 import {
   getBegin,
-  getDay,
   getEnd,
-  getMonth,
-  getYear,
 } from './shared/dates';
 import { isMaxDate, isMinDate } from './shared/propTypes';
 import { between } from './shared/utils';
@@ -200,8 +198,8 @@ export default class DateInput extends PureComponent {
     ) {
       if (nextValue) {
         nextState.year = getYear(nextValue);
-        nextState.month = getMonth(nextValue);
-        nextState.day = getDay(nextValue);
+        nextState.month = getMonthHuman(nextValue);
+        nextState.day = getDate(nextValue);
       } else {
         nextState.year = null;
         nextState.month = null;

diff --git a/src/DateInput/DayInput.jsx b/src/DateInput/DayInput.jsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import {
+  getYear,
+  getMonthHuman,
+  getDate,
+  getDaysInMonth,
+} from '@wojtekmaj/date-utils';
 
 import Input from './Input';
 
-import {
-  getDay,
-  getDaysInMonth,
-  getMonth,
-  getYear,
-} from '../shared/dates';
 import { isMaxDate, isMinDate } from '../shared/propTypes';
 import { min, max } from '../shared/utils';
 
@@ -29,11 +29,11 @@ export default function DayInput({
 
   const maxDay = min(
     currentMonthMaxDays,
-    maxDate && year === getYear(maxDate) && month === getMonth(maxDate) && getDay(maxDate),
+    maxDate && year === getYear(maxDate) && month === getMonthHuman(maxDate) && getDate(maxDate),
   );
 
   const minDay = max(
-    1, minDate && year === getYear(minDate) && month === getMonth(minDate) && getDay(minDate),
+    1, minDate && year === getYear(minDate) && month === getMonthHuman(minDate) && getDate(minDate),
   );
 
   return (

diff --git a/src/DateInput/MonthInput.jsx b/src/DateInput/MonthInput.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { getYear, getMonthHuman } from '@wojtekmaj/date-utils';
 
 import Input from './Input';
 
-import { getMonth, getYear } from '../shared/dates';
 import { isMaxDate, isMinDate } from '../shared/propTypes';
 import { min, max } from '../shared/utils';
 
@@ -13,8 +13,8 @@ export default function MonthInput({
   year,
   ...otherProps
 }) {
-  const maxMonth = min(12, maxDate && year === getYear(maxDate) && getMonth(maxDate));
-  const minMonth = max(1, minDate && year === getYear(minDate) && getMonth(minDate));
+  const maxMonth = min(12, maxDate && year === getYear(maxDate) && getMonthHuman(maxDate));
+  const minMonth = max(1, minDate && year === getYear(minDate) && getMonthHuman(minDate));
 
   return (
     <Input

diff --git a/src/DateInput/MonthSelect.jsx b/src/DateInput/MonthSelect.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import mergeClassNames from 'merge-class-names';
+import { getYear, getMonthHuman } from '@wojtekmaj/date-utils';
 
-import { getMonth, getYear } from '../shared/dates';
 import { formatMonth, formatShortMonth } from '../shared/dateFormatter';
 import { isMaxDate, isMinDate } from '../shared/propTypes';
 import { min, max } from '../shared/utils';
@@ -20,8 +20,8 @@ export default function MonthSelect({
   year,
   ...otherProps
 }) {
-  const maxMonth = min(12, maxDate && year === getYear(maxDate) && getMonth(maxDate));
-  const minMonth = max(1, minDate && year === getYear(minDate) && getMonth(minDate));
+  const maxMonth = min(12, maxDate && year === getYear(maxDate) && getMonthHuman(maxDate));
+  const minMonth = max(1, minDate && year === getYear(minDate) && getMonthHuman(minDate));
   const dates = [...Array(12)].map((el, index) => new Date(2019, index, 1));
   const name = 'month';
   const formatter = short ? formatShortMonth : formatMonth;
@@ -48,7 +48,7 @@ export default function MonthSelect({
         </option>
       )}
       {dates.map((date) => {
-        const month = getMonth(date);
+        const month = getMonthHuman(date);
         const disabled = month < minMonth || month > maxMonth;
 
         return (

diff --git a/src/DateInput/NativeInput.jsx b/src/DateInput/NativeInput.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
 import {
+  getYear,
   getISOLocalDate,
   getISOLocalMonth,
-  getYear,
-} from '../shared/dates';
+} from '@wojtekmaj/date-utils';
+
 import { isMaxDate, isMinDate, isValueType } from '../shared/propTypes';
 
 export default function NativeInput({

diff --git a/src/DateInput/YearInput.jsx b/src/DateInput/YearInput.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { getYear } from '@wojtekmaj/date-utils';
 
 import Input from './Input';
 
-import { getYear } from '../shared/dates';
 import { isMaxDate, isMinDate, isValueType } from '../shared/propTypes';
 import { max, min } from '../shared/utils';
 

diff --git a/src/shared/dates.js b/src/shared/dates.js
@@ -1,11 +1,4 @@
 export {
-  getYear,
-  getMonth,
-  getMonthIndex,
-  getDay,
-  getDaysInMonth,
   getBegin,
   getEnd,
-  getISOLocalMonth,
-  getISOLocalDate,
 } from 'react-calendar/dist/shared/dates';
diff --git a/test/ValidityOptions.jsx b/test/ValidityOptions.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
-import { getISOLocalDate } from '../src/shared/dates';
+import { getISOLocalDate } from '@wojtekmaj/date-utils';
 
 export default function ValidityOptions({
   maxDate,

diff --git a/test/ValueOptions.jsx b/test/ValueOptions.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
-import { getISOLocalDate } from '../src/shared/dates';
+import { getISOLocalDate } from '@wojtekmaj/date-utils';
 
 export default function ValueOptions({
   setState,

diff --git a/test/package.json b/test/package.json
@@ -13,6 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@wojtekmaj/date-utils": "^1.0.0",
     "prop-types": "^15.6.0",
     "react": "^16.5.0",
     "react-date-picker": "latest",

diff --git a/yarn.lock b/yarn.lock
@@ -962,6 +962,11 @@
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
   integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
 
+"@wojtekmaj/date-utils@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@wojtekmaj/date-utils/-/date-utils-1.0.0.tgz#97aebf5ab317cf40d56492642f921480d4f89342"
+  integrity sha512-tHzSlWCmb1GjxjiPRTju7i2bQigYriFDmCpaf1dC4SebFRjhBiuRpIxy5oI3b3ZMg9OzqGnApdZJrlYSwEUJAg==
+
 abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"