@navikt/ds-react 5.4.0 → 5.4.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/monthpicker/MonthButton.js +6 -5
- package/cjs/util/AnimateHeight.js +3 -1
- package/esm/date/monthpicker/MonthButton.js +6 -5
- package/esm/date/monthpicker/MonthButton.js.map +1 -1
- package/esm/util/AnimateHeight.js +3 -1
- package/esm/util/AnimateHeight.js.map +1 -1
- package/package.json +4 -4
- package/src/date/monthpicker/MonthButton.tsx +6 -5
- package/src/date/monthpicker/monthpicker.stories.tsx +1 -1
- package/src/util/AnimateHeight.tsx +3 -1
|
@@ -30,7 +30,8 @@ exports.MonthButton = void 0;
|
|
|
30
30
|
const clsx_1 = __importDefault(require("clsx"));
|
|
31
31
|
const format_1 = __importDefault(require("date-fns/format"));
|
|
32
32
|
const isSameMonth_1 = __importDefault(require("date-fns/isSameMonth"));
|
|
33
|
-
const
|
|
33
|
+
const compareAsc_1 = __importDefault(require("date-fns/compareAsc"));
|
|
34
|
+
const compareDesc_1 = __importDefault(require("date-fns/compareDesc"));
|
|
34
35
|
const setYear_1 = __importDefault(require("date-fns/setYear"));
|
|
35
36
|
const react_1 = __importStar(require("react"));
|
|
36
37
|
const react_day_picker_1 = require("react-day-picker");
|
|
@@ -38,14 +39,14 @@ const context_1 = require("../context");
|
|
|
38
39
|
const utils_1 = require("../utils");
|
|
39
40
|
const disableMonth = (month, fromDate, toDate) => {
|
|
40
41
|
if (fromDate && toDate) {
|
|
41
|
-
return (((0,
|
|
42
|
-
((0,
|
|
42
|
+
return (((0, compareAsc_1.default)(month, fromDate) === -1 && !(0, isSameMonth_1.default)(month, fromDate)) ||
|
|
43
|
+
((0, compareDesc_1.default)(month, toDate) === -1 && !(0, isSameMonth_1.default)(month, toDate)));
|
|
43
44
|
}
|
|
44
45
|
else if (fromDate) {
|
|
45
|
-
return (0,
|
|
46
|
+
return (0, compareAsc_1.default)(month, fromDate) === -1 && !(0, isSameMonth_1.default)(month, fromDate);
|
|
46
47
|
}
|
|
47
48
|
else if (toDate) {
|
|
48
|
-
return (0,
|
|
49
|
+
return (0, compareDesc_1.default)(month, toDate) === -1 && !(0, isSameMonth_1.default)(month, toDate);
|
|
49
50
|
}
|
|
50
51
|
return false;
|
|
51
52
|
};
|
|
@@ -77,7 +77,9 @@ const AnimateHeight = (_a) => {
|
|
|
77
77
|
let initOverflow = "visible";
|
|
78
78
|
if (typeof initHeight === "number") {
|
|
79
79
|
// Reset negative height to 0
|
|
80
|
-
|
|
80
|
+
if (typeof height !== "string") {
|
|
81
|
+
initHeight = height < 0 ? 0 : height;
|
|
82
|
+
}
|
|
81
83
|
initOverflow = "hidden";
|
|
82
84
|
}
|
|
83
85
|
else if (isPercentage(initHeight)) {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import cl from "clsx";
|
|
2
2
|
import format from "date-fns/format";
|
|
3
3
|
import isSameMonth from "date-fns/isSameMonth";
|
|
4
|
-
import
|
|
4
|
+
import compareAsc from "date-fns/compareAsc";
|
|
5
|
+
import compareDesc from "date-fns/compareDesc";
|
|
5
6
|
import setYear from "date-fns/setYear";
|
|
6
7
|
import React, { useEffect, useRef } from "react";
|
|
7
8
|
import { useDayPicker } from "react-day-picker";
|
|
@@ -9,14 +10,14 @@ import { useSharedMonthContext } from "../context";
|
|
|
9
10
|
import { dateIsInCurrentMonth, isMatch, nextEnabled } from "../utils";
|
|
10
11
|
const disableMonth = (month, fromDate, toDate) => {
|
|
11
12
|
if (fromDate && toDate) {
|
|
12
|
-
return ((
|
|
13
|
-
(
|
|
13
|
+
return ((compareAsc(month, fromDate) === -1 && !isSameMonth(month, fromDate)) ||
|
|
14
|
+
(compareDesc(month, toDate) === -1 && !isSameMonth(month, toDate)));
|
|
14
15
|
}
|
|
15
16
|
else if (fromDate) {
|
|
16
|
-
return
|
|
17
|
+
return compareAsc(month, fromDate) === -1 && !isSameMonth(month, fromDate);
|
|
17
18
|
}
|
|
18
19
|
else if (toDate) {
|
|
19
|
-
return
|
|
20
|
+
return compareDesc(month, toDate) === -1 && !isSameMonth(month, toDate);
|
|
20
21
|
}
|
|
21
22
|
return false;
|
|
22
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MonthButton.js","sourceRoot":"","sources":["../../../src/date/monthpicker/MonthButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAWtE,MAAM,YAAY,GAAG,CAAC,KAAW,EAAE,QAAe,EAAE,MAAa,EAAE,EAAE;IACnE,IAAI,QAAQ,IAAI,MAAM,EAAE;QACtB,OAAO,CACL,CAAC,
|
|
1
|
+
{"version":3,"file":"MonthButton.js","sourceRoot":"","sources":["../../../src/date/monthpicker/MonthButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAWtE,MAAM,YAAY,GAAG,CAAC,KAAW,EAAE,QAAe,EAAE,MAAa,EAAE,EAAE;IACnE,IAAI,QAAQ,IAAI,MAAM,EAAE;QACtB,OAAO,CACL,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CACnE,CAAC;KACH;SAAM,IAAI,QAAQ,EAAE;QACnB,OAAO,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;KAC5E;SAAM,IAAI,MAAM,EAAE;QACjB,OAAO,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACzE;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,KAAK,EACL,MAAM,EACN,KAAK,EACL,QAAQ,EACR,OAAO,EACP,UAAU,GACA,EAAE,EAAE;IACd,MAAM,GAAG,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAC5C,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAC/D,qBAAqB,EAAE,CAAC;IAE1B,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,YAAY,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,QAAQ,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAE5D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,EAAE;YACT,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAChE,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE7B,MAAM,UAAU,GACd,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,QAAQ,CAAC;QACrD,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAExC,OAAO,CACL,gCACE,GAAG,EAAE,GAAG,EACR,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EACvD,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE,EAAE,CAAC,0BAA0B,EAAE;YACxC,eAAe,EAAE,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC;YAClD,kBAAkB,EAAE,UAAU;YAC9B,kBAAkB,EAAE,UAAU;SAC/B,CAAC,EACF,QAAQ,EACN,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,CAAC,CAAC,EAER,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;YACf,MAAM,IAAI,GAAG,WAAW,CACtB,MAAM,EACN,CAAC,CAAC,GAAG,EACL,QAAQ,EACR,KAAK,EACL,MAAM,EACN,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,MAAM,CACP,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,UAAU,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,OAAO,EAAE,GAAG,EAAE;YACZ,UAAU,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;QAED,6CAAkB,MAAM,IACrB,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;aAChB,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CACb;QACP,8BAAM,SAAS,EAAC,eAAe,IAC5B,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CACvC,CACA,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -52,7 +52,9 @@ const AnimateHeight = (_a) => {
|
|
|
52
52
|
let initOverflow = "visible";
|
|
53
53
|
if (typeof initHeight === "number") {
|
|
54
54
|
// Reset negative height to 0
|
|
55
|
-
|
|
55
|
+
if (typeof height !== "string") {
|
|
56
|
+
initHeight = height < 0 ? 0 : height;
|
|
57
|
+
}
|
|
56
58
|
initOverflow = "hidden";
|
|
57
59
|
}
|
|
58
60
|
else if (isPercentage(initHeight)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnimateHeight.js","sourceRoot":"","sources":["../../src/util/AnimateHeight.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,0EAA0E;AAC1E,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQ1E,6BAA6B;AAE7B,SAAS,QAAQ,CAAC,CAAS;IACzB,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,YAAY,CAAC,MAAc;IAClC,oBAAoB;IACpB,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;QACjC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CACjD,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,OAA8B,EAAE,MAAc;IACjE,yFAAyF;IACzF,2EAA2E;IAC3E,IAAI,MAAM,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,EAAE;QAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;KAChC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,OAA8B,EAAE,MAAc;IACjE,yFAAyF;IACzF,2EAA2E;IAC3E,IAAI,MAAM,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,EAAE;QAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;KAC5B;AACH,CAAC;AAiBD,MAAM,aAAa,GAAiC,CAAC,EAQpD,EAAE,EAAE;QARgD,EACnD,QAAQ,EACR,SAAS,EACT,cAAc,EACd,QAAQ,EAAE,YAAY,GAAG,GAAG,EAC5B,MAAM,GAAG,MAAM,EACf,MAAM,OAEP,EADI,KAAK,cAP2C,2EAQpD,CADS;IAER,oCAAoC;IACpC,MAAM,UAAU,GAAG,MAAM,CAAS,MAAM,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAEpD,MAAM,yBAAyB,GAAG,MAAM,EAAW,CAAC;IACpD,MAAM,SAAS,GAAG,MAAM,EAAW,CAAC;IAEpC,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;IAEhD,MAAM,oBAAoB,GAAG,MAAM,CACjC,SAAS,IAAI,MAAM,CAAC,UAAU;QAC5B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,OAAO;QACvD,CAAC,CAAC,KAAK,CACV,CAAC;IAEF,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IAEjE,IAAI,UAAU,GAAW,MAAM,CAAC;IAChC,IAAI,YAAY,GAAa,SAAS,CAAC;IAEvC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,6BAA6B;QAC7B,UAAU,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AnimateHeight.js","sourceRoot":"","sources":["../../src/util/AnimateHeight.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": "5.4.
|
|
3
|
+
"version": "5.4.1",
|
|
4
4
|
"description": "Aksel react-components for NAV designsystem",
|
|
5
5
|
"author": "Aksel | NAV designsystem team",
|
|
6
6
|
"license": "MIT",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@floating-ui/react": "0.24.1",
|
|
41
|
-
"@navikt/aksel-icons": "^5.4.
|
|
41
|
+
"@navikt/aksel-icons": "^5.4.1",
|
|
42
42
|
"@radix-ui/react-tabs": "1.0.0",
|
|
43
43
|
"@radix-ui/react-toggle-group": "1.0.0",
|
|
44
44
|
"clsx": "^1.2.1",
|
|
@@ -63,8 +63,8 @@
|
|
|
63
63
|
"rimraf": "3.0.2",
|
|
64
64
|
"swr": "^1.1.2",
|
|
65
65
|
"ts-jest": "^29.0.0",
|
|
66
|
-
"ts-node": "10.9.
|
|
67
|
-
"typescript": "^
|
|
66
|
+
"ts-node": "^10.9.1",
|
|
67
|
+
"typescript": "^5.1.6"
|
|
68
68
|
},
|
|
69
69
|
"peerDependencies": {
|
|
70
70
|
"@types/react": "^17.0.30 || ^18.0.0",
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import cl from "clsx";
|
|
2
2
|
import format from "date-fns/format";
|
|
3
3
|
import isSameMonth from "date-fns/isSameMonth";
|
|
4
|
-
import
|
|
4
|
+
import compareAsc from "date-fns/compareAsc";
|
|
5
|
+
import compareDesc from "date-fns/compareDesc";
|
|
5
6
|
import setYear from "date-fns/setYear";
|
|
6
7
|
import React, { useEffect, useRef } from "react";
|
|
7
8
|
import { useDayPicker } from "react-day-picker";
|
|
@@ -20,13 +21,13 @@ interface MonthType {
|
|
|
20
21
|
const disableMonth = (month: Date, fromDate?: Date, toDate?: Date) => {
|
|
21
22
|
if (fromDate && toDate) {
|
|
22
23
|
return (
|
|
23
|
-
(
|
|
24
|
-
(
|
|
24
|
+
(compareAsc(month, fromDate) === -1 && !isSameMonth(month, fromDate)) ||
|
|
25
|
+
(compareDesc(month, toDate) === -1 && !isSameMonth(month, toDate))
|
|
25
26
|
);
|
|
26
27
|
} else if (fromDate) {
|
|
27
|
-
return
|
|
28
|
+
return compareAsc(month, fromDate) === -1 && !isSameMonth(month, fromDate);
|
|
28
29
|
} else if (toDate) {
|
|
29
|
-
return
|
|
30
|
+
return compareDesc(month, toDate) === -1 && !isSameMonth(month, toDate);
|
|
30
31
|
}
|
|
31
32
|
return false;
|
|
32
33
|
};
|
|
@@ -85,7 +85,9 @@ const AnimateHeight: React.FC<AnimateHeightProps> = ({
|
|
|
85
85
|
|
|
86
86
|
if (typeof initHeight === "number") {
|
|
87
87
|
// Reset negative height to 0
|
|
88
|
-
|
|
88
|
+
if (typeof height !== "string") {
|
|
89
|
+
initHeight = height < 0 ? 0 : height;
|
|
90
|
+
}
|
|
89
91
|
initOverflow = "hidden";
|
|
90
92
|
} else if (isPercentage(initHeight)) {
|
|
91
93
|
// If value is string "0%" make sure we convert it to number 0
|