@navikt/ds-react 7.14.0 → 7.14.1
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.
- package/cjs/date/date-utils/check-dates.d.ts +5 -0
- package/cjs/date/date-utils/check-dates.js +6 -0
- package/cjs/date/date-utils/check-dates.js.map +1 -1
- package/cjs/date/date-utils/index.d.ts +1 -1
- package/cjs/date/date-utils/index.js +2 -1
- package/cjs/date/date-utils/index.js.map +1 -1
- package/cjs/date/datepicker/parts/DatePicker.RDP.js +1 -4
- package/cjs/date/datepicker/parts/DatePicker.RDP.js.map +1 -1
- package/esm/date/date-utils/check-dates.d.ts +5 -0
- package/esm/date/date-utils/check-dates.js +6 -1
- package/esm/date/date-utils/check-dates.js.map +1 -1
- package/esm/date/date-utils/index.d.ts +1 -1
- package/esm/date/date-utils/index.js +1 -1
- package/esm/date/date-utils/index.js.map +1 -1
- package/esm/date/datepicker/parts/DatePicker.RDP.js +3 -6
- package/esm/date/datepicker/parts/DatePicker.RDP.js.map +1 -1
- package/package.json +3 -3
- package/src/date/date-utils/check-dates.ts +23 -1
- package/src/date/date-utils/clamp-dates.test.ts +83 -0
- package/src/date/date-utils/index.ts +5 -1
- package/src/date/datepicker/parts/DatePicker.RDP.tsx +3 -8
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
export declare const dateIsInCurrentMonth: (date: Date, dateToCompare: Date) => boolean;
|
|
2
2
|
/** @private */
|
|
3
3
|
export declare function isValidDate(day?: Date): boolean;
|
|
4
|
+
export declare function isDateOutsideRange({ day, fromDate, toDate, }: {
|
|
5
|
+
day: Date;
|
|
6
|
+
fromDate?: Date;
|
|
7
|
+
toDate?: Date;
|
|
8
|
+
}): boolean;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.dateIsInCurrentMonth = void 0;
|
|
4
4
|
exports.isValidDate = isValidDate;
|
|
5
|
+
exports.isDateOutsideRange = isDateOutsideRange;
|
|
5
6
|
const date_fns_1 = require("date-fns");
|
|
6
7
|
const dateIsInCurrentMonth = (date, dateToCompare) => {
|
|
7
8
|
return (0, date_fns_1.isThisMonth)((0, date_fns_1.setYear)(date, Number(dateToCompare.getFullYear())));
|
|
@@ -11,4 +12,9 @@ exports.dateIsInCurrentMonth = dateIsInCurrentMonth;
|
|
|
11
12
|
function isValidDate(day) {
|
|
12
13
|
return !!(day && !Number.isNaN(day.getTime()) && day.getFullYear() > 999);
|
|
13
14
|
}
|
|
15
|
+
function isDateOutsideRange({ day, fromDate, toDate, }) {
|
|
16
|
+
const isDateAfter = toDate && (0, date_fns_1.differenceInCalendarDays)(day, (0, date_fns_1.startOfDay)(toDate)) > 0;
|
|
17
|
+
const isDateBefore = fromDate && (0, date_fns_1.differenceInCalendarDays)((0, date_fns_1.startOfDay)(fromDate), day) > 0;
|
|
18
|
+
return isDateAfter || isDateBefore || false;
|
|
19
|
+
}
|
|
14
20
|
//# sourceMappingURL=check-dates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-dates.js","sourceRoot":"","sources":["../../../src/date/date-utils/check-dates.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"check-dates.js","sourceRoot":"","sources":["../../../src/date/date-utils/check-dates.ts"],"names":[],"mappings":";;;AAeA,kCAEC;AAED,gDAeC;AAlCD,uCAKkB;AAEX,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,aAAmB,EACV,EAAE;IACX,OAAO,IAAA,sBAAW,EAAC,IAAA,kBAAO,EAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AALW,QAAA,oBAAoB,wBAK/B;AAEF,eAAe;AACf,SAAgB,WAAW,CAAC,GAAU;IACpC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC;AAC5E,CAAC;AAED,SAAgB,kBAAkB,CAAC,EACjC,GAAG,EACH,QAAQ,EACR,MAAM,GAKP;IACC,MAAM,WAAW,GACf,MAAM,IAAI,IAAA,mCAAwB,EAAC,GAAG,EAAE,IAAA,qBAAU,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,YAAY,GAChB,QAAQ,IAAI,IAAA,mCAAwB,EAAC,IAAA,qBAAU,EAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,OAAO,WAAW,IAAI,YAAY,IAAI,KAAK,CAAC;AAC9C,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { formatDateForInput } from "./format-date";
|
|
2
2
|
export { INPUT_DATE_STRING_FORMAT_DATE, INPUT_DATE_STRING_FORMAT_MONTH, parseDate, } from "./parse-date";
|
|
3
3
|
export { disableDate } from "./dates-disabled";
|
|
4
|
-
export { dateIsInCurrentMonth, isValidDate } from "./check-dates";
|
|
4
|
+
export { dateIsInCurrentMonth, isValidDate, isDateOutsideRange, } from "./check-dates";
|
|
5
5
|
export { isMatch, isDateInRange } from "./is-match";
|
|
6
6
|
export { clampDisplayMonth, clampDisplayYear } from "./clamp-dates";
|
|
7
7
|
export { getMonthOptions, getYearOptions } from "./dropdown-options";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.calendarRange = exports.getYearOptions = exports.getMonthOptions = exports.clampDisplayYear = exports.clampDisplayMonth = exports.isDateInRange = exports.isMatch = exports.isValidDate = exports.dateIsInCurrentMonth = exports.disableDate = exports.parseDate = exports.INPUT_DATE_STRING_FORMAT_MONTH = exports.INPUT_DATE_STRING_FORMAT_DATE = exports.formatDateForInput = void 0;
|
|
3
|
+
exports.calendarRange = exports.getYearOptions = exports.getMonthOptions = exports.clampDisplayYear = exports.clampDisplayMonth = exports.isDateInRange = exports.isMatch = exports.isDateOutsideRange = exports.isValidDate = exports.dateIsInCurrentMonth = exports.disableDate = exports.parseDate = exports.INPUT_DATE_STRING_FORMAT_MONTH = exports.INPUT_DATE_STRING_FORMAT_DATE = exports.formatDateForInput = void 0;
|
|
4
4
|
var format_date_1 = require("./format-date");
|
|
5
5
|
Object.defineProperty(exports, "formatDateForInput", { enumerable: true, get: function () { return format_date_1.formatDateForInput; } });
|
|
6
6
|
var parse_date_1 = require("./parse-date");
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "disableDate", { enumerable: true, get: function
|
|
|
12
12
|
var check_dates_1 = require("./check-dates");
|
|
13
13
|
Object.defineProperty(exports, "dateIsInCurrentMonth", { enumerable: true, get: function () { return check_dates_1.dateIsInCurrentMonth; } });
|
|
14
14
|
Object.defineProperty(exports, "isValidDate", { enumerable: true, get: function () { return check_dates_1.isValidDate; } });
|
|
15
|
+
Object.defineProperty(exports, "isDateOutsideRange", { enumerable: true, get: function () { return check_dates_1.isDateOutsideRange; } });
|
|
15
16
|
var is_match_1 = require("./is-match");
|
|
16
17
|
Object.defineProperty(exports, "isMatch", { enumerable: true, get: function () { return is_match_1.isMatch; } });
|
|
17
18
|
Object.defineProperty(exports, "isDateInRange", { enumerable: true, get: function () { return is_match_1.isDateInRange; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/date/date-utils/index.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AAA1C,iHAAA,kBAAkB,OAAA;AAC3B,2CAIsB;AAHpB,2HAAA,6BAA6B,OAAA;AAC7B,4HAAA,8BAA8B,OAAA;AAC9B,uGAAA,SAAS,OAAA;AAEX,mDAA+C;AAAtC,6GAAA,WAAW,OAAA;AACpB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/date/date-utils/index.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AAA1C,iHAAA,kBAAkB,OAAA;AAC3B,2CAIsB;AAHpB,2HAAA,6BAA6B,OAAA;AAC7B,4HAAA,8BAA8B,OAAA;AAC9B,uGAAA,SAAS,OAAA;AAEX,mDAA+C;AAAtC,6GAAA,WAAW,OAAA;AACpB,6CAIuB;AAHrB,mHAAA,oBAAoB,OAAA;AACpB,0GAAA,WAAW,OAAA;AACX,iHAAA,kBAAkB,OAAA;AAEpB,uCAAoD;AAA3C,mGAAA,OAAO,OAAA;AAAE,yGAAA,aAAa,OAAA;AAC/B,6CAAoE;AAA3D,gHAAA,iBAAiB,OAAA;AAAE,+GAAA,gBAAgB,OAAA;AAC5C,uDAAqE;AAA5D,mHAAA,eAAe,OAAA;AAAE,kHAAA,cAAc,OAAA;AACxC,mDAAiD;AAAxC,+GAAA,aAAa,OAAA"}
|
|
@@ -88,12 +88,9 @@ const ReactDayPicker = (_a) => {
|
|
|
88
88
|
Weekdays: (0, react_1.useCallback)((props) => (react_1.default.createElement("thead", Object.assign({}, props, { className: "rdp-head", "aria-hidden": true }),
|
|
89
89
|
react_1.default.createElement("tr", { className: "rdp-head_row" }, props.children))), []),
|
|
90
90
|
}, className: (0, clsx_1.default)("navds-date", className), disabled: (day) => {
|
|
91
|
-
const isOutside = (toDate && (0, date_fns_1.isAfter)(day, toDate)) ||
|
|
92
|
-
(fromDate && (0, date_fns_1.isBefore)(day, fromDate)) ||
|
|
93
|
-
false;
|
|
94
91
|
return ((disableWeekends && (0, date_fns_1.isWeekend)(day)) ||
|
|
95
92
|
(0, react_day_picker_1.dateMatchModifiers)(day, disabled) ||
|
|
96
|
-
|
|
93
|
+
(0, date_utils_1.isDateOutsideRange)({ day, fromDate, toDate }));
|
|
97
94
|
}, weekStartsOn: 1, modifiers: {
|
|
98
95
|
weekend: (day) => disableWeekends && (0, date_fns_1.isWeekend)(day),
|
|
99
96
|
}, modifiersClassNames: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
export declare const dateIsInCurrentMonth: (date: Date, dateToCompare: Date) => boolean;
|
|
2
2
|
/** @private */
|
|
3
3
|
export declare function isValidDate(day?: Date): boolean;
|
|
4
|
+
export declare function isDateOutsideRange({ day, fromDate, toDate, }: {
|
|
5
|
+
day: Date;
|
|
6
|
+
fromDate?: Date;
|
|
7
|
+
toDate?: Date;
|
|
8
|
+
}): boolean;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isThisMonth, setYear } from "date-fns";
|
|
1
|
+
import { differenceInCalendarDays, isThisMonth, setYear, startOfDay, } from "date-fns";
|
|
2
2
|
export const dateIsInCurrentMonth = (date, dateToCompare) => {
|
|
3
3
|
return isThisMonth(setYear(date, Number(dateToCompare.getFullYear())));
|
|
4
4
|
};
|
|
@@ -6,4 +6,9 @@ export const dateIsInCurrentMonth = (date, dateToCompare) => {
|
|
|
6
6
|
export function isValidDate(day) {
|
|
7
7
|
return !!(day && !Number.isNaN(day.getTime()) && day.getFullYear() > 999);
|
|
8
8
|
}
|
|
9
|
+
export function isDateOutsideRange({ day, fromDate, toDate, }) {
|
|
10
|
+
const isDateAfter = toDate && differenceInCalendarDays(day, startOfDay(toDate)) > 0;
|
|
11
|
+
const isDateBefore = fromDate && differenceInCalendarDays(startOfDay(fromDate), day) > 0;
|
|
12
|
+
return isDateAfter || isDateBefore || false;
|
|
13
|
+
}
|
|
9
14
|
//# sourceMappingURL=check-dates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-dates.js","sourceRoot":"","sources":["../../../src/date/date-utils/check-dates.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"check-dates.js","sourceRoot":"","sources":["../../../src/date/date-utils/check-dates.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,WAAW,EACX,OAAO,EACP,UAAU,GACX,MAAM,UAAU,CAAC;AAElB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,aAAmB,EACV,EAAE;IACX,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,eAAe;AACf,MAAM,UAAU,WAAW,CAAC,GAAU;IACpC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EACjC,GAAG,EACH,QAAQ,EACR,MAAM,GAKP;IACC,MAAM,WAAW,GACf,MAAM,IAAI,wBAAwB,CAAC,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,YAAY,GAChB,QAAQ,IAAI,wBAAwB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,OAAO,WAAW,IAAI,YAAY,IAAI,KAAK,CAAC;AAC9C,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { formatDateForInput } from "./format-date.js";
|
|
2
2
|
export { INPUT_DATE_STRING_FORMAT_DATE, INPUT_DATE_STRING_FORMAT_MONTH, parseDate, } from "./parse-date.js";
|
|
3
3
|
export { disableDate } from "./dates-disabled.js";
|
|
4
|
-
export { dateIsInCurrentMonth, isValidDate } from "./check-dates.js";
|
|
4
|
+
export { dateIsInCurrentMonth, isValidDate, isDateOutsideRange, } from "./check-dates.js";
|
|
5
5
|
export { isMatch, isDateInRange } from "./is-match.js";
|
|
6
6
|
export { clampDisplayMonth, clampDisplayYear } from "./clamp-dates.js";
|
|
7
7
|
export { getMonthOptions, getYearOptions } from "./dropdown-options.js";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { formatDateForInput } from "./format-date.js";
|
|
2
2
|
export { INPUT_DATE_STRING_FORMAT_DATE, INPUT_DATE_STRING_FORMAT_MONTH, parseDate, } from "./parse-date.js";
|
|
3
3
|
export { disableDate } from "./dates-disabled.js";
|
|
4
|
-
export { dateIsInCurrentMonth, isValidDate } from "./check-dates.js";
|
|
4
|
+
export { dateIsInCurrentMonth, isValidDate, isDateOutsideRange, } from "./check-dates.js";
|
|
5
5
|
export { isMatch, isDateInRange } from "./is-match.js";
|
|
6
6
|
export { clampDisplayMonth, clampDisplayYear } from "./clamp-dates.js";
|
|
7
7
|
export { getMonthOptions, getYearOptions } from "./dropdown-options.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/date/date-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EACL,6BAA6B,EAC7B,8BAA8B,EAC9B,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/date/date-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EACL,6BAA6B,EAC7B,8BAA8B,EAC9B,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,kBAAkB,GACnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -10,14 +10,14 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
10
10
|
return t;
|
|
11
11
|
};
|
|
12
12
|
import cl from "clsx";
|
|
13
|
-
import {
|
|
13
|
+
import { isWeekend } from "date-fns";
|
|
14
14
|
import React, { useCallback } from "react";
|
|
15
15
|
import { DayPicker, dateMatchModifiers } from "react-day-picker";
|
|
16
16
|
import { Show } from "../../../layout/responsive/index.js";
|
|
17
17
|
import { omit } from "../../../util/index.js";
|
|
18
18
|
import { useDateLocale } from "../../../util/i18n/i18n.hooks.js";
|
|
19
19
|
import { getLocaleFromString } from "../../Date.locale.js";
|
|
20
|
-
import { clampDisplayMonth } from "../../date-utils/index.js";
|
|
20
|
+
import { clampDisplayMonth, isDateOutsideRange } from "../../date-utils/index.js";
|
|
21
21
|
import { DatePickerDayButton } from "./DatePicker.DayButton.js";
|
|
22
22
|
import { DatePickerMonths } from "./DatePicker.Months.js";
|
|
23
23
|
import { DatePickerWeekNumber } from "./DatePicker.WeekNumber.js";
|
|
@@ -59,12 +59,9 @@ const ReactDayPicker = (_a) => {
|
|
|
59
59
|
Weekdays: useCallback((props) => (React.createElement("thead", Object.assign({}, props, { className: "rdp-head", "aria-hidden": true }),
|
|
60
60
|
React.createElement("tr", { className: "rdp-head_row" }, props.children))), []),
|
|
61
61
|
}, className: cl("navds-date", className), disabled: (day) => {
|
|
62
|
-
const isOutside = (toDate && isAfter(day, toDate)) ||
|
|
63
|
-
(fromDate && isBefore(day, fromDate)) ||
|
|
64
|
-
false;
|
|
65
62
|
return ((disableWeekends && isWeekend(day)) ||
|
|
66
63
|
dateMatchModifiers(day, disabled) ||
|
|
67
|
-
|
|
64
|
+
isDateOutsideRange({ day, fromDate, toDate }));
|
|
68
65
|
}, weekStartsOn: 1, modifiers: {
|
|
69
66
|
weekend: (day) => disableWeekends && isWeekend(day),
|
|
70
67
|
}, modifiersClassNames: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@navikt/ds-react",
|
|
3
|
-
"version": "7.14.
|
|
3
|
+
"version": "7.14.1",
|
|
4
4
|
"description": "React components from the Norwegian Labour and Welfare Administration.",
|
|
5
5
|
"author": "Aksel, a team part of the Norwegian Labour and Welfare Administration.",
|
|
6
6
|
"license": "MIT",
|
|
@@ -625,8 +625,8 @@
|
|
|
625
625
|
"dependencies": {
|
|
626
626
|
"@floating-ui/react": "0.25.4",
|
|
627
627
|
"@floating-ui/react-dom": "^2.0.9",
|
|
628
|
-
"@navikt/aksel-icons": "^7.14.
|
|
629
|
-
"@navikt/ds-tokens": "^7.14.
|
|
628
|
+
"@navikt/aksel-icons": "^7.14.1",
|
|
629
|
+
"@navikt/ds-tokens": "^7.14.1",
|
|
630
630
|
"clsx": "^2.1.0",
|
|
631
631
|
"date-fns": "^4.0.0",
|
|
632
632
|
"react-day-picker": "9.5.0"
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
differenceInCalendarDays,
|
|
3
|
+
isThisMonth,
|
|
4
|
+
setYear,
|
|
5
|
+
startOfDay,
|
|
6
|
+
} from "date-fns";
|
|
2
7
|
|
|
3
8
|
export const dateIsInCurrentMonth = (
|
|
4
9
|
date: Date,
|
|
@@ -11,3 +16,20 @@ export const dateIsInCurrentMonth = (
|
|
|
11
16
|
export function isValidDate(day?: Date): boolean {
|
|
12
17
|
return !!(day && !Number.isNaN(day.getTime()) && day.getFullYear() > 999);
|
|
13
18
|
}
|
|
19
|
+
|
|
20
|
+
export function isDateOutsideRange({
|
|
21
|
+
day,
|
|
22
|
+
fromDate,
|
|
23
|
+
toDate,
|
|
24
|
+
}: {
|
|
25
|
+
day: Date;
|
|
26
|
+
fromDate?: Date;
|
|
27
|
+
toDate?: Date;
|
|
28
|
+
}): boolean {
|
|
29
|
+
const isDateAfter =
|
|
30
|
+
toDate && differenceInCalendarDays(day, startOfDay(toDate)) > 0;
|
|
31
|
+
const isDateBefore =
|
|
32
|
+
fromDate && differenceInCalendarDays(startOfDay(fromDate), day) > 0;
|
|
33
|
+
|
|
34
|
+
return isDateAfter || isDateBefore || false;
|
|
35
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { startOfMonth, startOfYear } from "date-fns";
|
|
2
2
|
import { describe, expect, test } from "vitest";
|
|
3
|
+
import { isDateOutsideRange } from "./check-dates";
|
|
3
4
|
import { clampDisplayMonth, clampDisplayYear } from "./clamp-dates";
|
|
4
5
|
|
|
5
6
|
describe("clampDisplayMonth", () => {
|
|
@@ -71,3 +72,85 @@ describe("clampDisplayYear", () => {
|
|
|
71
72
|
).toEqual(startOfYear(month));
|
|
72
73
|
});
|
|
73
74
|
});
|
|
75
|
+
|
|
76
|
+
describe("isDateOutsideRange", () => {
|
|
77
|
+
test("returns false when day is within range", () => {
|
|
78
|
+
const day = new Date(2023, 5, 15);
|
|
79
|
+
const fromDate = new Date(2023, 0, 1);
|
|
80
|
+
const toDate = new Date(2023, 11, 31);
|
|
81
|
+
|
|
82
|
+
expect(isDateOutsideRange({ day, fromDate, toDate })).toBe(false);
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
test("returns true when day is after toDate", () => {
|
|
86
|
+
const day = new Date(2024, 0, 1);
|
|
87
|
+
const fromDate = new Date(2023, 0, 1);
|
|
88
|
+
const toDate = new Date(2023, 11, 31);
|
|
89
|
+
|
|
90
|
+
expect(isDateOutsideRange({ day, fromDate, toDate })).toBe(true);
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
test("returns true when day is before fromDate", () => {
|
|
94
|
+
const day = new Date(2022, 11, 31);
|
|
95
|
+
const fromDate = new Date(2023, 0, 1);
|
|
96
|
+
const toDate = new Date(2023, 11, 31);
|
|
97
|
+
|
|
98
|
+
expect(isDateOutsideRange({ day, fromDate, toDate })).toBe(true);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
test("returns false when fromDate and toDate are not provided", () => {
|
|
102
|
+
const day = new Date(2023, 5, 15);
|
|
103
|
+
|
|
104
|
+
expect(isDateOutsideRange({ day })).toBe(false);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
test("returns true when only toDate is provided and day is after toDate", () => {
|
|
108
|
+
const day = new Date(2024, 0, 1);
|
|
109
|
+
const toDate = new Date(2023, 11, 31);
|
|
110
|
+
|
|
111
|
+
expect(isDateOutsideRange({ day, toDate })).toBe(true);
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
test("returns false when only toDate is provided and day is before toDate", () => {
|
|
115
|
+
const day = new Date(2023, 5, 15);
|
|
116
|
+
const toDate = new Date(2023, 11, 31);
|
|
117
|
+
|
|
118
|
+
expect(isDateOutsideRange({ day, toDate })).toBe(false);
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
test("returns true when only fromDate is provided and day is before fromDate", () => {
|
|
122
|
+
const day = new Date(2022, 11, 31);
|
|
123
|
+
const fromDate = new Date(2023, 0, 1);
|
|
124
|
+
|
|
125
|
+
expect(isDateOutsideRange({ day, fromDate })).toBe(true);
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
test("returns false when only fromDate is provided and day is after fromDate", () => {
|
|
129
|
+
const day = new Date(2023, 5, 15);
|
|
130
|
+
const fromDate = new Date(2023, 0, 1);
|
|
131
|
+
|
|
132
|
+
expect(isDateOutsideRange({ day, fromDate })).toBe(false);
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
test("returns false when day is identical to fromDate", () => {
|
|
136
|
+
const day = new Date(2023, 0, 1);
|
|
137
|
+
const fromDate = new Date(2023, 0, 1);
|
|
138
|
+
|
|
139
|
+
expect(isDateOutsideRange({ day, fromDate })).toBe(false);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
test("returns false when day is identical to toDate", () => {
|
|
143
|
+
const day = new Date(2023, 11, 31);
|
|
144
|
+
const toDate = new Date(2023, 11, 31);
|
|
145
|
+
|
|
146
|
+
expect(isDateOutsideRange({ day, toDate })).toBe(false);
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
test("returns false when day is identical to both fromDate and toDate", () => {
|
|
150
|
+
const day = new Date(2023, 5, 15);
|
|
151
|
+
const fromDate = new Date(2023, 5, 15);
|
|
152
|
+
const toDate = new Date(2023, 5, 15);
|
|
153
|
+
|
|
154
|
+
expect(isDateOutsideRange({ day, fromDate, toDate })).toBe(false);
|
|
155
|
+
});
|
|
156
|
+
});
|
|
@@ -5,7 +5,11 @@ export {
|
|
|
5
5
|
parseDate,
|
|
6
6
|
} from "./parse-date";
|
|
7
7
|
export { disableDate } from "./dates-disabled";
|
|
8
|
-
export {
|
|
8
|
+
export {
|
|
9
|
+
dateIsInCurrentMonth,
|
|
10
|
+
isValidDate,
|
|
11
|
+
isDateOutsideRange,
|
|
12
|
+
} from "./check-dates";
|
|
9
13
|
export { isMatch, isDateInRange } from "./is-match";
|
|
10
14
|
export { clampDisplayMonth, clampDisplayYear } from "./clamp-dates";
|
|
11
15
|
export { getMonthOptions, getYearOptions } from "./dropdown-options";
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import cl from "clsx";
|
|
2
|
-
import {
|
|
2
|
+
import { isWeekend } from "date-fns";
|
|
3
3
|
import React, { useCallback } from "react";
|
|
4
4
|
import { ClassNames, DayPicker, dateMatchModifiers } from "react-day-picker";
|
|
5
5
|
import { Show } from "../../../layout/responsive";
|
|
6
6
|
import { omit } from "../../../util";
|
|
7
7
|
import { useDateLocale } from "../../../util/i18n/i18n.hooks";
|
|
8
8
|
import { getLocaleFromString } from "../../Date.locale";
|
|
9
|
-
import { clampDisplayMonth } from "../../date-utils";
|
|
9
|
+
import { clampDisplayMonth, isDateOutsideRange } from "../../date-utils";
|
|
10
10
|
import {
|
|
11
11
|
ConditionalModeProps,
|
|
12
12
|
DatePickerDefaultProps,
|
|
@@ -141,15 +141,10 @@ const ReactDayPicker = ({
|
|
|
141
141
|
}}
|
|
142
142
|
className={cl("navds-date", className)}
|
|
143
143
|
disabled={(day) => {
|
|
144
|
-
const isOutside =
|
|
145
|
-
(toDate && isAfter(day, toDate)) ||
|
|
146
|
-
(fromDate && isBefore(day, fromDate)) ||
|
|
147
|
-
false;
|
|
148
|
-
|
|
149
144
|
return (
|
|
150
145
|
(disableWeekends && isWeekend(day)) ||
|
|
151
146
|
dateMatchModifiers(day, disabled) ||
|
|
152
|
-
|
|
147
|
+
isDateOutsideRange({ day, fromDate, toDate })
|
|
153
148
|
);
|
|
154
149
|
}}
|
|
155
150
|
weekStartsOn={1}
|