Focus on popover first then element
Browse files- src/events.ts +1 -1
- src/popover.ts +1 -1
src/events.ts
CHANGED
@@ -28,8 +28,8 @@ function trapFocus(e: KeyboardEvent) {
|
|
28 |
const popoverEl = getState("popover")?.wrapper;
|
29 |
|
30 |
const focusableEls = getFocusableElements([
|
31 |
-
...(activeElement ? [activeElement] : []),
|
32 |
...(popoverEl ? [popoverEl] : []),
|
|
|
33 |
]);
|
34 |
|
35 |
const firstFocusableEl = focusableEls[0];
|
|
|
28 |
const popoverEl = getState("popover")?.wrapper;
|
29 |
|
30 |
const focusableEls = getFocusableElements([
|
|
|
31 |
...(popoverEl ? [popoverEl] : []),
|
32 |
+
...(activeElement ? [activeElement] : []),
|
33 |
]);
|
34 |
|
35 |
const firstFocusableEl = focusableEls[0];
|
src/popover.ts
CHANGED
@@ -224,7 +224,7 @@ export function renderPopover(element: Element, step: DriveStep) {
|
|
224 |
|
225 |
// Focus on the first focusable element in active element or popover
|
226 |
const isToDummyElement = element.classList.contains("driver-dummy-element");
|
227 |
-
const focusableElement = getFocusableElements([...(isToDummyElement ? [] : [element])
|
228 |
if (focusableElement.length > 0) {
|
229 |
focusableElement[0].focus();
|
230 |
}
|
|
|
224 |
|
225 |
// Focus on the first focusable element in active element or popover
|
226 |
const isToDummyElement = element.classList.contains("driver-dummy-element");
|
227 |
+
const focusableElement = getFocusableElements([popoverWrapper, ...(isToDummyElement ? [] : [element])]);
|
228 |
if (focusableElement.length > 0) {
|
229 |
focusableElement[0].focus();
|
230 |
}
|