@canonical/react-components 3.8.1 → 3.8.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.
|
@@ -35,11 +35,11 @@ const Modal = _ref => {
|
|
|
35
35
|
const shouldClose = (0, _react.useRef)(false);
|
|
36
36
|
const modalRef = (0, _react.useRef)(null);
|
|
37
37
|
const closeButtonRef = (0, _react.useRef)(null);
|
|
38
|
-
const focusableModalElements = (0, _react.useRef)(null);
|
|
39
38
|
const handleTabKey = event => {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
const
|
|
39
|
+
const focusableModalElements = modalRef.current.querySelectorAll(focusableElementSelectors);
|
|
40
|
+
if (focusableModalElements.length > 0) {
|
|
41
|
+
const firstElement = focusableModalElements[0];
|
|
42
|
+
const lastElement = focusableModalElements[focusableModalElements.length - 1];
|
|
43
43
|
if (!event.shiftKey && document.activeElement === lastElement) {
|
|
44
44
|
firstElement.focus();
|
|
45
45
|
event.preventDefault();
|
|
@@ -70,7 +70,6 @@ const Modal = _ref => {
|
|
|
70
70
|
} else {
|
|
71
71
|
modalRef.current.focus();
|
|
72
72
|
}
|
|
73
|
-
focusableModalElements.current = modalRef.current.querySelectorAll(focusableElementSelectors);
|
|
74
73
|
}, [focusRef]);
|
|
75
74
|
(0, _react.useEffect)(() => {
|
|
76
75
|
const keyListenersMap = new Map([["Escape", handleEscKey], ["Tab", handleTabKey]]);
|
|
@@ -29,11 +29,11 @@ export var Modal = _ref => {
|
|
|
29
29
|
var shouldClose = useRef(false);
|
|
30
30
|
var modalRef = useRef(null);
|
|
31
31
|
var closeButtonRef = useRef(null);
|
|
32
|
-
var focusableModalElements = useRef(null);
|
|
33
32
|
var handleTabKey = event => {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
var
|
|
33
|
+
var focusableModalElements = modalRef.current.querySelectorAll(focusableElementSelectors);
|
|
34
|
+
if (focusableModalElements.length > 0) {
|
|
35
|
+
var firstElement = focusableModalElements[0];
|
|
36
|
+
var lastElement = focusableModalElements[focusableModalElements.length - 1];
|
|
37
37
|
if (!event.shiftKey && document.activeElement === lastElement) {
|
|
38
38
|
firstElement.focus();
|
|
39
39
|
event.preventDefault();
|
|
@@ -64,7 +64,6 @@ export var Modal = _ref => {
|
|
|
64
64
|
} else {
|
|
65
65
|
modalRef.current.focus();
|
|
66
66
|
}
|
|
67
|
-
focusableModalElements.current = modalRef.current.querySelectorAll(focusableElementSelectors);
|
|
68
67
|
}, [focusRef]);
|
|
69
68
|
useEffect(() => {
|
|
70
69
|
var keyListenersMap = new Map([["Escape", handleEscKey], ["Tab", handleTabKey]]);
|