@navikt/ds-react 5.7.3 → 5.7.4
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/popover/Popover.js
CHANGED
|
@@ -69,6 +69,7 @@ exports.Popover = (0, react_2.forwardRef)((_a, ref) => {
|
|
|
69
69
|
const arrowRef = (0, react_2.useRef)(null);
|
|
70
70
|
const isInModal = (0, react_2.useContext)(ModalContext_1.ModalContext) !== null;
|
|
71
71
|
const chosenStrategy = userStrategy !== null && userStrategy !== void 0 ? userStrategy : (isInModal ? "fixed" : "absolute");
|
|
72
|
+
const chosenFlip = isInModal ? true : _flip;
|
|
72
73
|
const { x, y, strategy, context, update, refs, placement: flPlacement, middlewareData: { arrow: { x: arrowX, y: arrowY } = {} }, } = (0, react_1.useFloating)({
|
|
73
74
|
strategy: chosenStrategy,
|
|
74
75
|
placement,
|
|
@@ -76,7 +77,8 @@ exports.Popover = (0, react_2.forwardRef)((_a, ref) => {
|
|
|
76
77
|
onOpenChange: () => onClose(),
|
|
77
78
|
middleware: [
|
|
78
79
|
(0, react_1.offset)(offset !== null && offset !== void 0 ? offset : (arrow ? 16 : 4)),
|
|
79
|
-
|
|
80
|
+
chosenFlip &&
|
|
81
|
+
(0, react_1.flip)({ padding: 5, fallbackPlacements: ["bottom", "top"] }),
|
|
80
82
|
(0, react_1.shift)({ padding: 12 }),
|
|
81
83
|
(0, react_1.arrow)({ element: arrowRef, padding: 8 }),
|
|
82
84
|
],
|
package/esm/popover/Popover.js
CHANGED
|
@@ -40,6 +40,7 @@ export const Popover = forwardRef((_a, ref) => {
|
|
|
40
40
|
const arrowRef = useRef(null);
|
|
41
41
|
const isInModal = useContext(ModalContext) !== null;
|
|
42
42
|
const chosenStrategy = userStrategy !== null && userStrategy !== void 0 ? userStrategy : (isInModal ? "fixed" : "absolute");
|
|
43
|
+
const chosenFlip = isInModal ? true : _flip;
|
|
43
44
|
const { x, y, strategy, context, update, refs, placement: flPlacement, middlewareData: { arrow: { x: arrowX, y: arrowY } = {} }, } = useFloating({
|
|
44
45
|
strategy: chosenStrategy,
|
|
45
46
|
placement,
|
|
@@ -47,7 +48,8 @@ export const Popover = forwardRef((_a, ref) => {
|
|
|
47
48
|
onOpenChange: () => onClose(),
|
|
48
49
|
middleware: [
|
|
49
50
|
flOffset(offset !== null && offset !== void 0 ? offset : (arrow ? 16 : 4)),
|
|
50
|
-
|
|
51
|
+
chosenFlip &&
|
|
52
|
+
flip({ padding: 5, fallbackPlacements: ["bottom", "top"] }),
|
|
51
53
|
shift({ padding: 12 }),
|
|
52
54
|
flArrow({ element: arrowRef, padding: 8 }),
|
|
53
55
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Popover.js","sourceRoot":"","sources":["../../src/popover/Popover.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EACL,UAAU,EACV,KAAK,IAAI,OAAO,EAChB,MAAM,IAAI,QAAQ,EAClB,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,UAAU,EACV,WAAW,EACX,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,KAAK,EAAE,EAEZ,UAAU,EACV,WAAW,EACX,UAAU,EACV,OAAO,EACP,MAAM,GACP,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,cAAsC,MAAM,kBAAkB,CAAC;AAwEtE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAC/B,CACE,EAaC,EACD,GAAG,EACH,EAAE;QAfF,EACE,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,GAAG,IAAI,EACZ,IAAI,EACJ,OAAO,EACP,SAAS,GAAG,KAAK,EACjB,MAAM,EACN,QAAQ,EAAE,YAAY,EACtB,YAAY,GAAG,KAAK,EACpB,IAAI,EAAE,KAAK,GAAG,IAAI,OAEnB,EADI,IAAI,cAZT,4HAaC,CADQ;IAIT,MAAM,QAAQ,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACpD,MAAM,cAAc,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Popover.js","sourceRoot":"","sources":["../../src/popover/Popover.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.7.
|
|
3
|
+
"version": "5.7.4",
|
|
4
4
|
"description": "Aksel react-components for NAV designsystem",
|
|
5
5
|
"author": "Aksel | NAV designsystem team",
|
|
6
6
|
"license": "MIT",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@floating-ui/react": "0.25.4",
|
|
41
|
-
"@navikt/aksel-icons": "^5.7.
|
|
42
|
-
"@navikt/ds-tokens": "^5.7.
|
|
41
|
+
"@navikt/aksel-icons": "^5.7.4",
|
|
42
|
+
"@navikt/ds-tokens": "^5.7.4",
|
|
43
43
|
"@radix-ui/react-tabs": "1.0.0",
|
|
44
44
|
"@radix-ui/react-toggle-group": "1.0.0",
|
|
45
45
|
"clsx": "^1.2.1",
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/* eslint-disable react-hooks/rules-of-hooks */
|
|
2
2
|
import { Meta, StoryObj } from "@storybook/react";
|
|
3
|
+
import isSameDay from "date-fns/isSameDay";
|
|
3
4
|
import React, { useId, useState } from "react";
|
|
4
5
|
import { useDatepicker, useRangeDatepicker } from "..";
|
|
5
|
-
import { Button, HGrid, VStack } from "../..";
|
|
6
|
+
import { BodyLong, Button, HGrid, HStack, Modal, VStack } from "../..";
|
|
7
|
+
|
|
6
8
|
import DatePicker, { DatePickerProps } from "./DatePicker";
|
|
7
|
-
import isSameDay from "date-fns/isSameDay";
|
|
8
9
|
|
|
9
10
|
const disabledDays = [
|
|
10
11
|
new Date("Oct 10 2022"),
|
|
@@ -432,3 +433,42 @@ export const WeekDayClick = () => {
|
|
|
432
433
|
</VStack>
|
|
433
434
|
);
|
|
434
435
|
};
|
|
436
|
+
|
|
437
|
+
export const ModalDemo = () => {
|
|
438
|
+
const { datepickerProps, inputProps } = useDatepicker({
|
|
439
|
+
fromDate: new Date("Aug 23 2019"),
|
|
440
|
+
toDate: new Date("Feb 23 2024"),
|
|
441
|
+
onDateChange: console.log,
|
|
442
|
+
});
|
|
443
|
+
|
|
444
|
+
return (
|
|
445
|
+
<Modal open header={{ heading: "Modal-demo" }} width="1024px">
|
|
446
|
+
<Modal.Body style={{ position: "relative" }}>
|
|
447
|
+
<BodyLong>
|
|
448
|
+
Lorem ipsum dolor sit, amet consectetur adipisicing elit. Maiores nisi
|
|
449
|
+
incidunt ipsum cupiditate nostrum nesciunt, corrupti nihil at atque
|
|
450
|
+
animi ab aut. Quam iusto harum eligendi magnam nulla repudiandae
|
|
451
|
+
molestias.
|
|
452
|
+
</BodyLong>
|
|
453
|
+
|
|
454
|
+
<HGrid gap="6" columns={{ xs: 1, lg: 2 }}>
|
|
455
|
+
<HStack justify="center" align="start">
|
|
456
|
+
<DatePicker.Standalone
|
|
457
|
+
fromDate={new Date("Aug 23 2019")}
|
|
458
|
+
toDate={new Date("Feb 23 2024")}
|
|
459
|
+
/>
|
|
460
|
+
</HStack>
|
|
461
|
+
<DatePicker {...datepickerProps} dropdownCaption>
|
|
462
|
+
<DatePicker.Input {...inputProps} label="Velg dato" />
|
|
463
|
+
</DatePicker>
|
|
464
|
+
<HStack justify="center">
|
|
465
|
+
<DatePicker.Standalone
|
|
466
|
+
fromDate={new Date("Aug 23 2019")}
|
|
467
|
+
toDate={new Date("Feb 23 2024")}
|
|
468
|
+
/>
|
|
469
|
+
</HStack>
|
|
470
|
+
</HGrid>
|
|
471
|
+
</Modal.Body>
|
|
472
|
+
</Modal>
|
|
473
|
+
);
|
|
474
|
+
};
|
package/src/popover/Popover.tsx
CHANGED
|
@@ -133,6 +133,7 @@ export const Popover = forwardRef<HTMLDivElement, PopoverProps>(
|
|
|
133
133
|
const arrowRef = useRef<HTMLDivElement | null>(null);
|
|
134
134
|
const isInModal = useContext(ModalContext) !== null;
|
|
135
135
|
const chosenStrategy = userStrategy ?? (isInModal ? "fixed" : "absolute");
|
|
136
|
+
const chosenFlip = isInModal ? true : _flip;
|
|
136
137
|
|
|
137
138
|
const {
|
|
138
139
|
x,
|
|
@@ -150,7 +151,8 @@ export const Popover = forwardRef<HTMLDivElement, PopoverProps>(
|
|
|
150
151
|
onOpenChange: () => onClose(),
|
|
151
152
|
middleware: [
|
|
152
153
|
flOffset(offset ?? (arrow ? 16 : 4)),
|
|
153
|
-
|
|
154
|
+
chosenFlip &&
|
|
155
|
+
flip({ padding: 5, fallbackPlacements: ["bottom", "top"] }),
|
|
154
156
|
shift({ padding: 12 }),
|
|
155
157
|
flArrow({ element: arrowRef, padding: 8 }),
|
|
156
158
|
],
|