@navikt/ds-react 7.33.0 → 7.33.2
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/datepicker/hooks/useRangeDatepicker.js +2 -2
- package/cjs/date/datepicker/hooks/useRangeDatepicker.js.map +1 -1
- package/cjs/form/combobox/FilteredOptions/FilteredOptions.js +0 -1
- package/cjs/form/combobox/FilteredOptions/FilteredOptions.js.map +1 -1
- package/cjs/overlays/action-menu/ActionMenu.js +2 -5
- package/cjs/overlays/action-menu/ActionMenu.js.map +1 -1
- package/cjs/overlays/dismissablelayer/DismissableLayer.d.ts +3 -30
- package/cjs/overlays/dismissablelayer/DismissableLayer.js +141 -134
- package/cjs/overlays/dismissablelayer/DismissableLayer.js.map +1 -1
- package/cjs/overlays/dismissablelayer/util/sort-layers.d.ts +18 -0
- package/cjs/overlays/dismissablelayer/util/sort-layers.js +51 -0
- package/cjs/overlays/dismissablelayer/util/sort-layers.js.map +1 -0
- package/cjs/overlays/floating-menu/Menu.d.ts +5 -7
- package/cjs/overlays/floating-menu/Menu.js +7 -15
- package/cjs/overlays/floating-menu/Menu.js.map +1 -1
- package/cjs/popover/Popover.js +0 -1
- package/cjs/popover/Popover.js.map +1 -1
- package/cjs/portal/Portal.d.ts +1 -3
- package/cjs/portal/Portal.js +49 -17
- package/cjs/portal/Portal.js.map +1 -1
- package/cjs/timeline/Timeline.d.ts +1 -1
- package/cjs/timeline/Timeline.js +1 -1
- package/cjs/timeline/Timeline.js.map +1 -1
- package/cjs/timeline/index.d.ts +1 -1
- package/cjs/timeline/index.js +1 -1
- package/cjs/timeline/index.js.map +1 -1
- package/cjs/timeline/pin/Pin.d.ts +9 -0
- package/cjs/timeline/pin/Pin.js +68 -0
- package/cjs/timeline/pin/Pin.js.map +1 -0
- package/cjs/timeline/pin/PinInternal.d.ts +13 -0
- package/cjs/timeline/{Pin.js → pin/PinInternal.js} +9 -10
- package/cjs/timeline/pin/PinInternal.js.map +1 -0
- package/cjs/tooltip/Tooltip.js +23 -22
- package/cjs/tooltip/Tooltip.js.map +1 -1
- package/cjs/util/focus-boundary/FocusBoundary.d.ts +19 -10
- package/cjs/util/focus-boundary/FocusBoundary.js +107 -63
- package/cjs/util/focus-boundary/FocusBoundary.js.map +1 -1
- package/cjs/util/hooks/useScrollLock.js +17 -3
- package/cjs/util/hooks/useScrollLock.js.map +1 -1
- package/esm/date/datepicker/hooks/useRangeDatepicker.js +2 -2
- package/esm/date/datepicker/hooks/useRangeDatepicker.js.map +1 -1
- package/esm/form/combobox/FilteredOptions/FilteredOptions.js +0 -1
- package/esm/form/combobox/FilteredOptions/FilteredOptions.js.map +1 -1
- package/esm/overlays/action-menu/ActionMenu.js +2 -5
- package/esm/overlays/action-menu/ActionMenu.js.map +1 -1
- package/esm/overlays/dismissablelayer/DismissableLayer.d.ts +3 -30
- package/esm/overlays/dismissablelayer/DismissableLayer.js +140 -132
- package/esm/overlays/dismissablelayer/DismissableLayer.js.map +1 -1
- package/esm/overlays/dismissablelayer/util/sort-layers.d.ts +18 -0
- package/esm/overlays/dismissablelayer/util/sort-layers.js +49 -0
- package/esm/overlays/dismissablelayer/util/sort-layers.js.map +1 -0
- package/esm/overlays/floating-menu/Menu.d.ts +5 -7
- package/esm/overlays/floating-menu/Menu.js +7 -15
- package/esm/overlays/floating-menu/Menu.js.map +1 -1
- package/esm/popover/Popover.js +0 -1
- package/esm/popover/Popover.js.map +1 -1
- package/esm/portal/Portal.d.ts +1 -3
- package/esm/portal/Portal.js +50 -18
- package/esm/portal/Portal.js.map +1 -1
- package/esm/timeline/Timeline.d.ts +1 -1
- package/esm/timeline/Timeline.js +1 -1
- package/esm/timeline/Timeline.js.map +1 -1
- package/esm/timeline/index.d.ts +1 -1
- package/esm/timeline/index.js +1 -1
- package/esm/timeline/index.js.map +1 -1
- package/esm/timeline/pin/Pin.d.ts +9 -0
- package/esm/timeline/pin/Pin.js +29 -0
- package/esm/timeline/pin/Pin.js.map +1 -0
- package/esm/timeline/pin/PinInternal.d.ts +13 -0
- package/esm/timeline/{Pin.js → pin/PinInternal.js} +8 -9
- package/esm/timeline/pin/PinInternal.js.map +1 -0
- package/esm/tooltip/Tooltip.js +23 -22
- package/esm/tooltip/Tooltip.js.map +1 -1
- package/esm/util/focus-boundary/FocusBoundary.d.ts +19 -10
- package/esm/util/focus-boundary/FocusBoundary.js +108 -64
- package/esm/util/focus-boundary/FocusBoundary.js.map +1 -1
- package/esm/util/hooks/useScrollLock.js +17 -3
- package/esm/util/hooks/useScrollLock.js.map +1 -1
- package/package.json +3 -3
- package/src/date/datepicker/hooks/useRangeDatepicker.tsx +4 -2
- package/src/form/combobox/FilteredOptions/FilteredOptions.tsx +0 -1
- package/src/overlays/action-menu/ActionMenu.tsx +2 -4
- package/src/overlays/dismissablelayer/DismissableLayer.tsx +219 -194
- package/src/overlays/dismissablelayer/util/sort-layers.test.ts +128 -0
- package/src/overlays/dismissablelayer/util/sort-layers.ts +61 -0
- package/src/overlays/floating-menu/Menu.tsx +11 -21
- package/src/popover/Popover.tsx +0 -1
- package/src/portal/Portal.tsx +89 -31
- package/src/timeline/Timeline.tsx +1 -1
- package/src/timeline/index.ts +1 -1
- package/src/timeline/pin/Pin.tsx +33 -0
- package/src/timeline/{Pin.tsx → pin/PinInternal.tsx} +8 -18
- package/src/tooltip/Tooltip.tsx +4 -4
- package/src/util/focus-boundary/FocusBoundary.tsx +164 -93
- package/src/util/hooks/useScrollLock.ts +22 -3
- package/cjs/timeline/Pin.d.ts +0 -17
- package/cjs/timeline/Pin.js.map +0 -1
- package/esm/timeline/Pin.d.ts +0 -17
- package/esm/timeline/Pin.js.map +0 -1
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
/**
|
|
3
|
-
* TODO:
|
|
4
|
-
* - owner(container) for corrent document
|
|
5
|
-
*/
|
|
6
2
|
interface FocusBoundaryProps extends React.HTMLAttributes<HTMLDivElement> {
|
|
7
3
|
/**
|
|
8
4
|
* FocusBoundary expects a single child element since its a slotted component.
|
|
@@ -29,15 +25,28 @@ interface FocusBoundaryProps extends React.HTMLAttributes<HTMLDivElement> {
|
|
|
29
25
|
*/
|
|
30
26
|
trapped?: boolean;
|
|
31
27
|
/**
|
|
32
|
-
*
|
|
33
|
-
*
|
|
28
|
+
* Will try to focus the given element on mount.
|
|
29
|
+
*
|
|
30
|
+
* If not provided, FocusBoundary will try to focus the first
|
|
31
|
+
* tabbable element inside the boundary.
|
|
32
|
+
*
|
|
33
|
+
* Set to `false` to not focus anything.
|
|
34
|
+
*/
|
|
35
|
+
initialFocus?: boolean | React.MutableRefObject<HTMLElement | null> | (() => boolean | HTMLElement | null | undefined);
|
|
36
|
+
/**
|
|
37
|
+
* Will try to focus the given element on unmount.
|
|
38
|
+
*
|
|
39
|
+
* If not provided, FocusBoundary will try to focus the element
|
|
40
|
+
* that was focused before the FocusBoundary mounted.
|
|
41
|
+
*
|
|
42
|
+
* Set to `false` to not focus anything.
|
|
34
43
|
*/
|
|
35
|
-
|
|
44
|
+
returnFocus?: boolean | React.MutableRefObject<HTMLElement | null>;
|
|
36
45
|
/**
|
|
37
|
-
*
|
|
38
|
-
*
|
|
46
|
+
* Hides all outside content from screen readers when true.
|
|
47
|
+
* @default false
|
|
39
48
|
*/
|
|
40
|
-
|
|
49
|
+
modal?: boolean;
|
|
41
50
|
}
|
|
42
51
|
declare const FocusBoundary: React.ForwardRefExoticComponent<FocusBoundaryProps & React.RefAttributes<HTMLDivElement>>;
|
|
43
52
|
export { FocusBoundary };
|
|
@@ -11,15 +11,14 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
11
11
|
};
|
|
12
12
|
import React, { forwardRef, useCallback, useEffect, useRef, useState, } from "react";
|
|
13
13
|
import { Slot } from "../../slot/Slot.js";
|
|
14
|
-
import { useMergeRefs } from "../../util/hooks/index.js";
|
|
15
|
-
import {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const EVENT_OPTIONS = { bubbles: false, cancelable: true };
|
|
14
|
+
import { useClientLayoutEffect, useMergeRefs } from "../../util/hooks/index.js";
|
|
15
|
+
import { hideNonTargetElements } from "../hideNonTargetElements.js";
|
|
16
|
+
import { useLatestRef } from "../hooks/useLatestRef.js";
|
|
17
|
+
import { ownerDocument } from "../owner.js";
|
|
19
18
|
const FocusBoundary = forwardRef((_a, forwardedRef) => {
|
|
20
|
-
var { loop = false, trapped = false,
|
|
21
|
-
const
|
|
22
|
-
const
|
|
19
|
+
var { loop = false, trapped = false, initialFocus = true, returnFocus = true, modal = false } = _a, restProps = __rest(_a, ["loop", "trapped", "initialFocus", "returnFocus", "modal"]);
|
|
20
|
+
const initialFocusRef = useLatestRef(initialFocus);
|
|
21
|
+
const returnFocusRef = useLatestRef(returnFocus);
|
|
23
22
|
const lastFocusedElementRef = useRef(null);
|
|
24
23
|
const [container, setContainer] = useState(null);
|
|
25
24
|
const mergedRefs = useMergeRefs(forwardedRef, setContainer);
|
|
@@ -101,69 +100,98 @@ const FocusBoundary = forwardRef((_a, forwardedRef) => {
|
|
|
101
100
|
observer.disconnect();
|
|
102
101
|
};
|
|
103
102
|
}, [trapped, container, focusBoundary.paused]);
|
|
104
|
-
/*
|
|
103
|
+
/* Adds element to focus-stack */
|
|
105
104
|
useEffect(() => {
|
|
106
105
|
if (!container) {
|
|
107
106
|
return;
|
|
108
107
|
}
|
|
109
108
|
focusBoundarysStack.add(focusBoundary);
|
|
110
|
-
const initialFocusedElement = document.activeElement;
|
|
111
|
-
const containsActiveElement = initialFocusedElement && container.contains(initialFocusedElement);
|
|
112
|
-
/*
|
|
113
|
-
* We only autofocus on mount if container does not contain active element.
|
|
114
|
-
* If container has an element with `autoFocus` attribute, browser will
|
|
115
|
-
* have already moved focus there before this effect runs.
|
|
116
|
-
*/
|
|
117
|
-
if (!containsActiveElement) {
|
|
118
|
-
const mountEvent = new CustomEvent(AUTOFOCUS_ON_MOUNT, EVENT_OPTIONS);
|
|
119
|
-
container.addEventListener(AUTOFOCUS_ON_MOUNT, onMountAutoFocus);
|
|
120
|
-
container.dispatchEvent(mountEvent);
|
|
121
|
-
/* If consumer does not manually prevent event and handle focus themselves */
|
|
122
|
-
if (!mountEvent.defaultPrevented) {
|
|
123
|
-
/**
|
|
124
|
-
* Attempts focusing the first element in a list of candidates.
|
|
125
|
-
* Stops when focus has actually moved.
|
|
126
|
-
*/
|
|
127
|
-
const candidates = removeLinks(getTabbableCandidates(container));
|
|
128
|
-
const previouslyFocusedElement = document.activeElement;
|
|
129
|
-
for (const candidate of candidates) {
|
|
130
|
-
focus(candidate, { select: true });
|
|
131
|
-
if (document.activeElement !== previouslyFocusedElement) {
|
|
132
|
-
break;
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
/* focusFirst might not find any candidates, so we fall back to focusing container */
|
|
136
|
-
if (document.activeElement === initialFocusedElement) {
|
|
137
|
-
focus(container);
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
109
|
return () => {
|
|
142
|
-
container.removeEventListener(AUTOFOCUS_ON_MOUNT, onMountAutoFocus);
|
|
143
|
-
/**
|
|
144
|
-
* https://github.com/facebook/react/issues/17894
|
|
145
|
-
* We delay to next tick to avoid issues with React's event system
|
|
146
|
-
* where calling `focus` inside a effect cleanup causes React to not call onFocus handlers.
|
|
147
|
-
*/
|
|
148
110
|
setTimeout(() => {
|
|
149
|
-
const unmountEvent = new CustomEvent(AUTOFOCUS_ON_UNMOUNT, EVENT_OPTIONS);
|
|
150
|
-
container.addEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus);
|
|
151
|
-
container.dispatchEvent(unmountEvent);
|
|
152
|
-
/* If consumer does not manually prevent event and handle focus themselves */
|
|
153
|
-
if (!unmountEvent.defaultPrevented) {
|
|
154
|
-
/* To avoid CPU-spikes on Chrome, we make sure element is still connected to the DOM. */
|
|
155
|
-
focus((initialFocusedElement === null || initialFocusedElement === void 0 ? void 0 : initialFocusedElement.isConnected)
|
|
156
|
-
? initialFocusedElement
|
|
157
|
-
: document.body, {
|
|
158
|
-
select: true,
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
/* Since this is inside a cleanup, we need to instantly remove the listener ourselves */
|
|
162
|
-
container.removeEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus);
|
|
163
111
|
focusBoundarysStack.remove(focusBoundary);
|
|
164
112
|
}, 0);
|
|
165
113
|
};
|
|
166
|
-
}, [container,
|
|
114
|
+
}, [container, focusBoundary]);
|
|
115
|
+
useEffect(() => {
|
|
116
|
+
if (!container || !modal) {
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
return hideNonTargetElements([container]);
|
|
120
|
+
}, [container, modal]);
|
|
121
|
+
/* Handles mount focus */
|
|
122
|
+
useClientLayoutEffect(() => {
|
|
123
|
+
if (!container || initialFocusRef.current === false) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
const ownerDoc = ownerDocument(container);
|
|
127
|
+
const previouslyFocusedElement = ownerDoc.activeElement;
|
|
128
|
+
queueMicrotask(() => {
|
|
129
|
+
const focusableElements = removeLinks(getTabbableCandidates(container));
|
|
130
|
+
const initialFocusValueOrFn = initialFocusRef.current;
|
|
131
|
+
const resolvedInitialFocus = typeof initialFocusValueOrFn === "function"
|
|
132
|
+
? initialFocusValueOrFn()
|
|
133
|
+
: initialFocusValueOrFn;
|
|
134
|
+
if (resolvedInitialFocus === undefined ||
|
|
135
|
+
resolvedInitialFocus === false) {
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
let elToFocus;
|
|
139
|
+
const fallbackelements = focusableElements[0] || container;
|
|
140
|
+
/* `null` should fallback to default behavior in case of an empty ref. */
|
|
141
|
+
if (resolvedInitialFocus === true || resolvedInitialFocus === null) {
|
|
142
|
+
elToFocus = fallbackelements;
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
elToFocus = resolveRef(resolvedInitialFocus) || fallbackelements;
|
|
146
|
+
}
|
|
147
|
+
const focusAlreadyInsideFloatingEl = container.contains(previouslyFocusedElement);
|
|
148
|
+
if (focusAlreadyInsideFloatingEl) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
focus(elToFocus, {
|
|
152
|
+
preventScroll: elToFocus === container,
|
|
153
|
+
sync: false,
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
}, [container, initialFocusRef]);
|
|
157
|
+
/* Handles unmount focus */
|
|
158
|
+
useClientLayoutEffect(() => {
|
|
159
|
+
if (!container) {
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
const ownerDoc = ownerDocument(container);
|
|
163
|
+
const previouslyFocusedElement = ownerDoc.activeElement;
|
|
164
|
+
function getReturnElement() {
|
|
165
|
+
let resolvedReturnFocusValue = returnFocusRef.current;
|
|
166
|
+
if (resolvedReturnFocusValue === undefined ||
|
|
167
|
+
resolvedReturnFocusValue === false) {
|
|
168
|
+
return null;
|
|
169
|
+
}
|
|
170
|
+
/* `null` should fallback to default behavior in case of an empty ref. */
|
|
171
|
+
if (resolvedReturnFocusValue === null) {
|
|
172
|
+
resolvedReturnFocusValue = true;
|
|
173
|
+
}
|
|
174
|
+
if (typeof resolvedReturnFocusValue === "boolean") {
|
|
175
|
+
const el = previouslyFocusedElement;
|
|
176
|
+
return (el === null || el === void 0 ? void 0 : el.isConnected) ? el : ownerDoc.body;
|
|
177
|
+
}
|
|
178
|
+
const fallback = previouslyFocusedElement || ownerDoc.body;
|
|
179
|
+
return resolveRef(resolvedReturnFocusValue) || fallback;
|
|
180
|
+
}
|
|
181
|
+
return () => {
|
|
182
|
+
const returnElement = getReturnElement();
|
|
183
|
+
const activeEl = ownerDoc.activeElement;
|
|
184
|
+
queueMicrotask(() => {
|
|
185
|
+
if (
|
|
186
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
187
|
+
returnFocusRef.current &&
|
|
188
|
+
returnElement &&
|
|
189
|
+
returnElement !== activeEl) {
|
|
190
|
+
returnElement.focus({ preventScroll: true });
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
};
|
|
194
|
+
}, [container, returnFocusRef]);
|
|
167
195
|
/* Takes care of looping focus */
|
|
168
196
|
const handleKeyDown = useCallback((event) => {
|
|
169
197
|
if ((!loop && !trapped) || focusBoundary.paused) {
|
|
@@ -276,13 +304,20 @@ function isHidden(node, { upTo }) {
|
|
|
276
304
|
}
|
|
277
305
|
return false;
|
|
278
306
|
}
|
|
279
|
-
|
|
307
|
+
let rafId = 0;
|
|
308
|
+
function focus(element, { select = false, preventScroll = true, sync = true } = {}) {
|
|
280
309
|
if (!(element === null || element === void 0 ? void 0 : element.focus)) {
|
|
281
310
|
return;
|
|
282
311
|
}
|
|
283
312
|
const previouslyFocusedElement = document.activeElement;
|
|
284
|
-
|
|
285
|
-
element.focus({ preventScroll
|
|
313
|
+
cancelAnimationFrame(rafId);
|
|
314
|
+
const exec = () => element.focus({ preventScroll });
|
|
315
|
+
if (sync) {
|
|
316
|
+
exec();
|
|
317
|
+
}
|
|
318
|
+
else {
|
|
319
|
+
rafId = requestAnimationFrame(exec);
|
|
320
|
+
}
|
|
286
321
|
if (!select) {
|
|
287
322
|
return;
|
|
288
323
|
}
|
|
@@ -325,5 +360,14 @@ function arrayRemove(array, item) {
|
|
|
325
360
|
function removeLinks(items) {
|
|
326
361
|
return items.filter((item) => item.tagName !== "A");
|
|
327
362
|
}
|
|
363
|
+
/**
|
|
364
|
+
* If the provided argument is a ref object, returns its `current` value.
|
|
365
|
+
* Otherwise, returns the argument itself.
|
|
366
|
+
*
|
|
367
|
+
* Non-generic to safely handle refs whose `.current` may be `null`.
|
|
368
|
+
*/
|
|
369
|
+
function resolveRef(maybeRef) {
|
|
370
|
+
return "current" in maybeRef ? maybeRef.current : maybeRef;
|
|
371
|
+
}
|
|
328
372
|
export { FocusBoundary };
|
|
329
373
|
//# sourceMappingURL=FocusBoundary.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusBoundary.js","sourceRoot":"","sources":["../../../src/util/focus-boundary/FocusBoundary.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,MAAM,EACN,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,kBAAkB,GAAG,gCAAgC,CAAC;AAC5D,MAAM,oBAAoB,GAAG,kCAAkC,CAAC;AAChE,MAAM,aAAa,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AAgD3D,MAAM,aAAa,GAAG,UAAU,CAC9B,CACE,EAMqB,EACrB,YAAY,EACZ,EAAE;QARF,EACE,IAAI,GAAG,KAAK,EACZ,OAAO,GAAG,KAAK,EACf,gBAAgB,EAAE,oBAAoB,EACtC,kBAAkB,EAAE,sBAAsB,OAEvB,EADhB,SAAS,cALd,6DAMC,CADa;IAId,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IAEpE,MAAM,qBAAqB,GAAG,MAAM,CAAqB,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAqB,IAAI,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAE5D,MAAM,aAAa,GAAG,MAAM,CAAmB;QAC7C,MAAM,EAAE,KAAK;QACb,KAAK;YACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM;YACJ,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACtB,CAAC;KACF,CAAC,CAAC,OAAO,CAAC;IAEX,2BAA2B;IAC3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QAED,SAAS,aAAa,CAAC,KAAiB;YACtC,IAAI,aAAa,CAAC,MAAM,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC/C,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAA4B,CAAC;YAClD,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC/B,qBAAqB,CAAC,OAAO,GAAG,MAAM,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,qBAAqB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,SAAS,cAAc,CAAC,KAAiB;YACvC,IAAI,aAAa,CAAC,MAAM,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC/C,OAAO;YACT,CAAC;YAED,MAAM,aAAa,GAAG,KAAK,CAAC,aAAmC,CAAC;YAEhE;;;;;;;;;;eAUG;YACH,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC3B,OAAO;YACT,CAAC;YAED;;;;;eAKG;YACH,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBACvC,KAAK,CAAC,qBAAqB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED;;;;WAIG;QACH,MAAM,eAAe,GAAG,CAAC,SAA2B,EAAE,EAAE;YACtD,IAAI,QAAQ,CAAC,aAAa,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC7C,OAAO;YACT,CAAC;YAED,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;gBACnE,KAAK,CAAC,SAAS,CAAC,CAAC;YACnB,CAAC;QACH,CAAC,CAAC;QAEF,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACpD,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACvD,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhE,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YACvD,QAAQ,CAAC,mBAAmB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YACzD,QAAQ,CAAC,UAAU,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/C,4CAA4C;IAC5C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QAED,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,qBAAqB,GACzB,QAAQ,CAAC,aAAmC,CAAC;QAC/C,MAAM,qBAAqB,GACzB,qBAAqB,IAAI,SAAS,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAErE;;;;WAIG;QACH,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;YACtE,SAAS,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;YACjE,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAEpC,6EAA6E;YAC7E,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;gBACjC;;;mBAGG;gBACH,MAAM,UAAU,GAAG,WAAW,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;gBACjE,MAAM,wBAAwB,GAAG,QAAQ,CAAC,aAAa,CAAC;gBACxD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,KAAK,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnC,IAAI,QAAQ,CAAC,aAAa,KAAK,wBAAwB,EAAE,CAAC;wBACxD,MAAM;oBACR,CAAC;gBACH,CAAC;gBAED,qFAAqF;gBACrF,IAAI,QAAQ,CAAC,aAAa,KAAK,qBAAqB,EAAE,CAAC;oBACrD,KAAK,CAAC,SAAS,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,GAAG,EAAE;YACV,SAAS,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;YAEpE;;;;eAIG;YACH,UAAU,CAAC,GAAG,EAAE;gBACd,MAAM,YAAY,GAAG,IAAI,WAAW,CAClC,oBAAoB,EACpB,aAAa,CACd,CAAC;gBACF,SAAS,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,kBAAkB,CAAC,CAAC;gBACrE,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;gBAEtC,6EAA6E;gBAC7E,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;oBACnC,wFAAwF;oBACxF,KAAK,CACH,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,WAAW;wBAChC,CAAC,CAAC,qBAAqB;wBACvB,CAAC,CAAC,QAAQ,CAAC,IAAI,EACjB;wBACE,MAAM,EAAE,IAAI;qBACb,CACF,CAAC;gBACJ,CAAC;gBACD,wFAAwF;gBACxF,SAAS,CAAC,mBAAmB,CAC3B,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;gBAEF,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAC5C,CAAC,EAAE,CAAC,CAAC,CAAC;QACR,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC;IAErE,iCAAiC;IACjC,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,KAA0B,EAAE,EAAE;QAC7B,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YAChD,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GACZ,KAAK,CAAC,GAAG,KAAK,KAAK;YACnB,CAAC,KAAK,CAAC,MAAM;YACb,CAAC,KAAK,CAAC,OAAO;YACd,CAAC,KAAK,CAAC,OAAO,CAAC;QAEjB,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC;QAE9C,IAAI,QAAQ,IAAI,cAAc,EAAE,CAAC;YAC/B,MAAM,eAAe,GAAG,KAAK,CAAC,aAA4B,CAAC;YAC3D,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;YAExD,sDAAsD;YACtD,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE,CAAC;gBACrB;;;;mBAIG;gBACH,IAAI,cAAc,KAAK,eAAe,EAAE,CAAC;oBACvC,KAAK,CAAC,cAAc,EAAE,CAAC;gBACzB,CAAC;gBACD,OAAO;YACT,CAAC;YAED;;eAEG;YACH,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;gBAC/C,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,IAAI,IAAI,EAAE,CAAC;oBACT,KAAK,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,cAAc,KAAK,KAAK,EAAE,CAAC;gBACtD,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,IAAI,IAAI,EAAE,CAAC;oBACT,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,EACD,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CACtC,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,kBACH,QAAQ,EAAE,CAAC,CAAC,IACR,SAAS,IACb,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,aAAa,IACxB,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,mFAAmF;AACnF;;GAEG;AACH,SAAS,gBAAgB,CAAC,SAAsB;IAC9C,MAAM,UAAU,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACpD,OAAO;QACL,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC;QACvC,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC;KACzC,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAAC,SAAsB;IACnD,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,YAAY,EAAE;QAC3E,UAAU,EAAE,CAAC,IAAS,EAAE,EAAE;YACxB,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;YACzE,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;gBAClD,OAAO,UAAU,CAAC,WAAW,CAAC;YAChC,CAAC;YAED;;;;eAIG;YACH,OAAO,IAAI,CAAC,QAAQ,IAAI,CAAC;gBACvB,CAAC,CAAC,UAAU,CAAC,aAAa;gBAC1B,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7B,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAA0B,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,QAAuB,EAAE,SAAsB;IACvE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;YAC5C,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAiB,EAAE,EAAE,IAAI,EAA0B;IACnE,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;QACZ,uBAAuB;QACvB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,aAA4B,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,KAAK,CAAC,OAA4B,EAAE,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,EAAE;IAClE,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IAED,MAAM,wBAAwB,GAAG,QAAQ,CAAC,aAAa,CAAC;IACxD,iEAAiE;IACjE,OAAO,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,mEAAmE;IACnE,IACE,OAAO,KAAK,wBAAwB;QACpC,OAAO,YAAY,gBAAgB;QACnC,QAAQ,IAAI,OAAO;QAEnB,OAAO,CAAC,MAAM,EAAE,CAAC;AACrB,CAAC;AAID,MAAM,mBAAmB,GAAG,yBAAyB,EAAE,CAAC;AAExD,SAAS,yBAAyB;IAChC,iEAAiE;IACjE,IAAI,KAAK,GAAuB,EAAE,CAAC;IAEnC,OAAO;QACL,GAAG,CAAC,aAA+B;YACjC,yEAAyE;YACzE,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,aAAa,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,KAAK,EAAE,CAAC;YAC/B,CAAC;YACD,wFAAwF;YACxF,KAAK,GAAG,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YAC1C,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,CAAC,aAA+B;;YACpC,KAAK,GAAG,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YAC1C,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,MAAM,EAAE,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAI,KAAU,EAAE,IAAO;IACzC,MAAM,YAAY,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,WAAW,CAAC,KAAoB;IACvC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC;AACtD,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"FocusBoundary.js","sourceRoot":"","sources":["../../../src/util/focus-boundary/FocusBoundary.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,18 @@ function hasInsetScrollbars(referenceElement) {
|
|
|
16
16
|
function preventScrollBasic(referenceElement) {
|
|
17
17
|
const doc = ownerDocument(referenceElement);
|
|
18
18
|
const html = doc.documentElement;
|
|
19
|
-
const
|
|
20
|
-
|
|
19
|
+
const body = doc.body;
|
|
20
|
+
/**
|
|
21
|
+
* If an `overflow` style is present on <html>, we need to lock it, because a lock on <body>
|
|
22
|
+
* won't have any effect.
|
|
23
|
+
* But if <body> has an `overflow` style (like `overflow-x: hidden`), we need to lock it
|
|
24
|
+
* instead, as sticky elements shift otherwise.
|
|
25
|
+
*/
|
|
26
|
+
const elementToLock = isOverflowElement(html) ? html : body;
|
|
27
|
+
const originalOverflow = elementToLock.style.overflow;
|
|
28
|
+
elementToLock.style.overflow = "hidden";
|
|
21
29
|
return () => {
|
|
22
|
-
|
|
30
|
+
elementToLock.style.overflow = originalOverflow;
|
|
23
31
|
};
|
|
24
32
|
}
|
|
25
33
|
function preventScrollStandard(referenceElement) {
|
|
@@ -264,5 +272,11 @@ function useScrollLock(params) {
|
|
|
264
272
|
return SCROLL_LOCKER.acquire(referenceElement);
|
|
265
273
|
}, [enabled, referenceElement]);
|
|
266
274
|
}
|
|
275
|
+
const invalidOverflowDisplayValues = new Set(["inline", "contents"]);
|
|
276
|
+
function isOverflowElement(element) {
|
|
277
|
+
const { overflow, overflowX, overflowY, display } = getComputedStyle(element);
|
|
278
|
+
return (/auto|scroll|overlay|hidden|clip/.test(overflow + overflowY + overflowX) &&
|
|
279
|
+
!invalidOverflowDisplayValues.has(display));
|
|
280
|
+
}
|
|
267
281
|
export { useScrollLock };
|
|
268
282
|
//# sourceMappingURL=useScrollLock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useScrollLock.js","sourceRoot":"","sources":["../../../src/util/hooks/useScrollLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,IAAI,kBAAkB,GAAiC,EAAE,CAAC;AAC1D,IAAI,kBAAkB,GAAiC,EAAE,CAAC;AAC1D,IAAI,0BAA0B,GAAG,EAAE,CAAC;AAEpC,SAAS,kBAAkB,CAAC,gBAAgC;IAC1D,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,GAAG,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC,WAAW,GAAG,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,kBAAkB,CAAC,gBAAgC;IAC1D,MAAM,GAAG,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,CAAC;IACjC,MAAM,
|
|
1
|
+
{"version":3,"file":"useScrollLock.js","sourceRoot":"","sources":["../../../src/util/hooks/useScrollLock.ts"],"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.33.
|
|
3
|
+
"version": "7.33.2",
|
|
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",
|
|
@@ -654,8 +654,8 @@
|
|
|
654
654
|
"dependencies": {
|
|
655
655
|
"@floating-ui/react": "0.27.8",
|
|
656
656
|
"@floating-ui/react-dom": "^2.1.6",
|
|
657
|
-
"@navikt/aksel-icons": "^7.33.
|
|
658
|
-
"@navikt/ds-tokens": "^7.33.
|
|
657
|
+
"@navikt/aksel-icons": "^7.33.2",
|
|
658
|
+
"@navikt/ds-tokens": "^7.33.2",
|
|
659
659
|
"clsx": "^2.1.0",
|
|
660
660
|
"date-fns": "^4.0.0",
|
|
661
661
|
"react-day-picker": "9.7.0"
|
|
@@ -237,7 +237,7 @@ export const useRangeDatepicker = (
|
|
|
237
237
|
|
|
238
238
|
// Initialize states
|
|
239
239
|
const [month, setMonth] = useState(
|
|
240
|
-
defaultSelected
|
|
240
|
+
defaultSelected?.from || defaultSelected?.to || defaultMonth || today,
|
|
241
241
|
);
|
|
242
242
|
const [selectedRange, setSelectedRange] = useState<DateRange | undefined>(
|
|
243
243
|
defaultSelected ?? { from: undefined, to: undefined },
|
|
@@ -277,7 +277,9 @@ export const useRangeDatepicker = (
|
|
|
277
277
|
|
|
278
278
|
const reset = () => {
|
|
279
279
|
updateRange(defaultSelected ?? { from: undefined, to: undefined });
|
|
280
|
-
setMonth(
|
|
280
|
+
setMonth(
|
|
281
|
+
defaultSelected?.from || defaultSelected?.to || defaultMonth || today,
|
|
282
|
+
);
|
|
281
283
|
setValidation(
|
|
282
284
|
initialValidation(
|
|
283
285
|
defaultSelected ?? { from: undefined, to: undefined },
|
|
@@ -353,7 +353,7 @@ export const ActionMenuContent = forwardRef<
|
|
|
353
353
|
const { cn } = useRenameCSS();
|
|
354
354
|
|
|
355
355
|
return (
|
|
356
|
-
<Menu.Portal rootElement={context.rootElement}
|
|
356
|
+
<Menu.Portal rootElement={context.rootElement}>
|
|
357
357
|
<Menu.Content
|
|
358
358
|
ref={ref}
|
|
359
359
|
id={context.contentId}
|
|
@@ -363,9 +363,7 @@ export const ActionMenuContent = forwardRef<
|
|
|
363
363
|
align={align}
|
|
364
364
|
sideOffset={4}
|
|
365
365
|
collisionPadding={10}
|
|
366
|
-
|
|
367
|
-
context.triggerRef.current?.focus();
|
|
368
|
-
}}
|
|
366
|
+
returnFocus={context.triggerRef}
|
|
369
367
|
safeZone={{ anchor: context.triggerRef.current }}
|
|
370
368
|
style={{
|
|
371
369
|
...style,
|